[PATCH] Revert "Adding quirk changes for Samsung X5 device"

[monish.kumar.r at intel.com]

From: Monish Kumar R <monish.kumar.r at intel.com>

This reverts commit 1c1b18c97b441cb1a4eb9c6e95d9c357b687cdd0.
---
 drivers/nvme/host/pci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index c01cb381c3ff..8bb184a7479c 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -3463,10 +3463,14 @@ static const struct pci_device_id nvme_id_table[] = {
 				NVME_QUIRK_128_BYTES_SQES |
 				NVME_QUIRK_SHARED_TAGS |
 				NVME_QUIRK_SKIP_CID_GEN },
+<<<<<<< HEAD
 	{ PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */
 		.driver_data =  NVME_QUIRK_DELAY_BEFORE_CHK_RDY|
 				NVME_QUIRK_NO_DEEPEST_PS |
 				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+=======
+
+>>>>>>> parent of 1c1b18c97b44... Adding quirk changes for Samsung X5 device
 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
 	{ 0, }
 };
-- 
2.17.1