[lvc-project] [PATCH] ata: ata_generic: use IS_ENABLED() macro

[Sergey Shtylyov]

Replace now gone out of fashion defined(CONFIG_PATA_TOSHIBA[_MODULE])
with the new-fangled IS_ENABLED() macro in the ata_generic[] definition.

Signed-off-by: Sergey Shtylyov <s.shtylyov at omp.ru>

---
This patch is against the for-next branch of the LibATA Group's repo.

 drivers/ata/ata_generic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/drivers/ata/ata_generic.c
===================================================================
--- linux.orig/drivers/ata/ata_generic.c
+++ linux/drivers/ata/ata_generic.c
@@ -220,7 +220,7 @@ static struct pci_device_id ata_generic[
 	{ PCI_DEVICE(PCI_VENDOR_ID_OPTI,   PCI_DEVICE_ID_OPTI_82C558), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE),
 	  .driver_data = ATA_GEN_FORCE_DMA },
-#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
+#if !IS_ENABLED(CONFIG_PATA_TOSHIBA)
 	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),  },
 	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_3),  },