ide: remove useless subdirs from drivers/ide/

Suggested-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

62 files changed, 63 insertions, 106 deletions

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 093d3248ca89..9cf92ac939d2 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -18,22 +18,66 @@ ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o
 
 obj-$(CONFIG_IDE)                       += ide-core.o
 
-ifeq ($(CONFIG_IDE_ARM), y)
-        ide-arm-core-y += arm/ide_arm.o
-        obj-y += ide-arm-core.o
-endif
-
-obj-$(CONFIG_IDE)                       += legacy/ pci/
+obj-$(CONFIG_IDE_ARM)                   += ide_arm.o
+
+obj-$(CONFIG_BLK_DEV_ALI14XX)           += ali14xx.o
+obj-$(CONFIG_BLK_DEV_UMC8672)           += umc8672.o
+obj-$(CONFIG_BLK_DEV_DTC2278)           += dtc2278.o
+obj-$(CONFIG_BLK_DEV_HT6560B)           += ht6560b.o
+obj-$(CONFIG_BLK_DEV_QD65XX)            += qd65xx.o
+obj-$(CONFIG_BLK_DEV_4DRIVES)           += ide-4drives.o
+
+obj-$(CONFIG_BLK_DEV_GAYLE)             += gayle.o
+obj-$(CONFIG_BLK_DEV_FALCON_IDE)        += falconide.o
+obj-$(CONFIG_BLK_DEV_MAC_IDE)           += macide.o
+obj-$(CONFIG_BLK_DEV_Q40IDE)            += q40ide.o
+obj-$(CONFIG_BLK_DEV_BUDDHA)            += buddha.o
+
+obj-$(CONFIG_BLK_DEV_AEC62XX)           += aec62xx.o
+obj-$(CONFIG_BLK_DEV_ALI15X3)           += alim15x3.o
+obj-$(CONFIG_BLK_DEV_AMD74XX)           += amd74xx.o
+obj-$(CONFIG_BLK_DEV_ATIIXP)            += atiixp.o
+obj-$(CONFIG_BLK_DEV_CELLEB)            += scc_pata.o
+obj-$(CONFIG_BLK_DEV_CMD64X)            += cmd64x.o
+obj-$(CONFIG_BLK_DEV_CS5520)            += cs5520.o
+obj-$(CONFIG_BLK_DEV_CS5530)            += cs5530.o
+obj-$(CONFIG_BLK_DEV_CS5535)            += cs5535.o
+obj-$(CONFIG_BLK_DEV_SC1200)            += sc1200.o
+obj-$(CONFIG_BLK_DEV_CY82C693)          += cy82c693.o
+obj-$(CONFIG_BLK_DEV_DELKIN)            += delkin_cb.o
+obj-$(CONFIG_BLK_DEV_HPT366)            += hpt366.o
+obj-$(CONFIG_BLK_DEV_IT8213)            += it8213.o
+obj-$(CONFIG_BLK_DEV_IT821X)            += it821x.o
+obj-$(CONFIG_BLK_DEV_JMICRON)           += jmicron.o
+obj-$(CONFIG_BLK_DEV_NS87415)           += ns87415.o
+obj-$(CONFIG_BLK_DEV_OPTI621)           += opti621.o
+obj-$(CONFIG_BLK_DEV_PDC202XX_OLD)      += pdc202xx_old.o
+obj-$(CONFIG_BLK_DEV_PDC202XX_NEW)      += pdc202xx_new.o
+obj-$(CONFIG_BLK_DEV_PIIX)              += piix.o
+obj-$(CONFIG_BLK_DEV_RZ1000)            += rz1000.o
+obj-$(CONFIG_BLK_DEV_SVWKS)             += serverworks.o
+obj-$(CONFIG_BLK_DEV_SGIIOC4)           += sgiioc4.o
+obj-$(CONFIG_BLK_DEV_SIIMAGE)           += siimage.o
+obj-$(CONFIG_BLK_DEV_SIS5513)           += sis5513.o
+obj-$(CONFIG_BLK_DEV_SL82C105)          += sl82c105.o
+obj-$(CONFIG_BLK_DEV_SLC90E66)          += slc90e66.o
+obj-$(CONFIG_BLK_DEV_TC86C001)          += tc86c001.o
+obj-$(CONFIG_BLK_DEV_TRIFLEX)           += triflex.o
+obj-$(CONFIG_BLK_DEV_TRM290)            += trm290.o
+obj-$(CONFIG_BLK_DEV_VIA82CXXX)         += via82cxxx.o
+
+# Must appear at the end of the block
+obj-$(CONFIG_BLK_DEV_GENERIC)           += ide-pci-generic.o
+ide-pci-generic-y                       += generic.o
 
 obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)       += ide-scan-pci.o
 
-ifeq ($(CONFIG_BLK_DEV_CMD640), y)
-        cmd640-core-y += pci/cmd640.o
-        obj-y += cmd640-core.o
-endif
+obj-$(CONFIG_BLK_DEV_CMD640)            += cmd640.o
+
+obj-$(CONFIG_BLK_DEV_IDE_PMAC)          += pmac.o
+
+obj-$(CONFIG_IDE_H8300)                 += ide-h8300.o
 
-obj-$(CONFIG_IDE)                       += ppc/
-obj-$(CONFIG_IDE_H8300)                 += h8300/
 obj-$(CONFIG_IDE_GENERIC)               += ide-generic.o
 obj-$(CONFIG_BLK_DEV_IDEPNP)            += ide-pnp.o
 
@@ -58,14 +102,12 @@ obj-$(CONFIG_IDE_GD)			+= ide-gd_mod.o
 obj-$(CONFIG_BLK_DEV_IDECD)             += ide-cd_mod.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)           += ide-tape.o
 
-ifeq ($(CONFIG_BLK_DEV_IDECS), y)
-        ide-cs-core-y += legacy/ide-cs.o
-        obj-y += ide-cs-core.o
-endif
+obj-$(CONFIG_BLK_DEV_IDECS)             += ide-cs.o
 
-ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
-        ide-platform-core-y += legacy/ide_platform.o
-        obj-y += ide-platform-core.o
-endif
+obj-$(CONFIG_BLK_DEV_PLATFORM)          += ide_platform.o
+
+obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)        += icside.o
+obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)        += rapide.o
+obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)   += palm_bk3710.o
 
-obj-$(CONFIG_IDE)                       += arm/ mips/
+obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)        += au1xxx-ide.o
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/aec62xx.c
index 4142c698e0d3..4142c698e0d3 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/aec62xx.c
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/ali14xx.c
index 90da1f953ed0..90da1f953ed0 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/ali14xx.c
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/alim15x3.c
index daf9dce39e52..daf9dce39e52 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/alim15x3.c
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/amd74xx.c
index 81ec73134eda..81ec73134eda 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/amd74xx.c
diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile
deleted file mode 100644
index 5bc26053afa6..000000000000
--- a/drivers/ide/arm/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)        += icside.o
-obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)        += rapide.o
-obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)   += palm_bk3710.o
-
-ifeq ($(CONFIG_IDE_ARM), m)
-        obj-m += ide_arm.o
-endif
-
-EXTRA_CFLAGS    := -Idrivers/ide
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/atiixp.c
index b2735d28f5cc..b2735d28f5cc 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/atiixp.c
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 0ec8fd1e4dcb..0ec8fd1e4dcb 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/buddha.c
index c5a3c9ef6a5d..c5a3c9ef6a5d 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/buddha.c
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/cmd640.c
index e4306647d00d..e4306647d00d 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/cmd640.c
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/cmd64x.c
index 935385c77e06..935385c77e06 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/cmd64x.c
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/cs5520.c
index 5efb467f8fa0..5efb467f8fa0 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/cs5520.c
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/cs5530.c
index 53f079cc00af..53f079cc00af 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/cs5530.c
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/cs5535.c
index 983d957a0189..983d957a0189 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/cs5535.c
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/cy82c693.c
index 5297f07d2933..5297f07d2933 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/cy82c693.c
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/delkin_cb.c
index 8f1b2d9f0513..8f1b2d9f0513 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/dtc2278.c
index 689b2e493413..689b2e493413 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/dtc2278.c
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/falconide.c
index 39d500d84b07..39d500d84b07 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/falconide.c
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/gayle.c
index 691506886561..691506886561 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/gayle.c
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/generic.c
index 474f96a7c076..474f96a7c076 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/generic.c
diff --git a/drivers/ide/h8300/Makefile b/drivers/ide/h8300/Makefile
deleted file mode 100644
index 5eba16f423f4..000000000000
--- a/drivers/ide/h8300/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_IDE_H8300)                 += ide-h8300.o
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/hpt366.c
index a7909e9c720e..a7909e9c720e 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/hpt366.c
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/ht6560b.c
index c7e5c2246b79..c7e5c2246b79 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/ht6560b.c
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/icside.c
index 76bdc9a27f6f..76bdc9a27f6f 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/icside.c
diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/ide-4drives.c
index 9e85b1ec9607..9e85b1ec9607 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/ide-4drives.c
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/ide-cs.c
index cb199c815b53..cb199c815b53 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/ide-cs.c
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/ide-h8300.c
index e2cdd2e9cdec..e2cdd2e9cdec 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/ide_arm.c
index f728f2927b5a..f728f2927b5a 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/ide_arm.c
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/ide_platform.c
index 051b4ab0f359..051b4ab0f359 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/ide_platform.c
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/it8213.c
index 7c2feeb3c5ec..7c2feeb3c5ec 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/it8213.c
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/it821x.c
index 995e18bb3139..995e18bb3139 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/it821x.c
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/jmicron.c
index 9a68433cf46d..9a68433cf46d 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/jmicron.c
diff --git a/drivers/ide/legacy/Makefile b/drivers/ide/legacy/Makefile
deleted file mode 100644
index 6939329f89e8..000000000000
--- a/drivers/ide/legacy/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# link order is important here
-
-obj-$(CONFIG_BLK_DEV_ALI14XX)           += ali14xx.o
-obj-$(CONFIG_BLK_DEV_UMC8672)           += umc8672.o
-obj-$(CONFIG_BLK_DEV_DTC2278)           += dtc2278.o
-obj-$(CONFIG_BLK_DEV_HT6560B)           += ht6560b.o
-obj-$(CONFIG_BLK_DEV_QD65XX)            += qd65xx.o
-obj-$(CONFIG_BLK_DEV_4DRIVES)           += ide-4drives.o
-
-obj-$(CONFIG_BLK_DEV_GAYLE)             += gayle.o
-obj-$(CONFIG_BLK_DEV_FALCON_IDE)        += falconide.o
-obj-$(CONFIG_BLK_DEV_MAC_IDE)           += macide.o
-obj-$(CONFIG_BLK_DEV_Q40IDE)            += q40ide.o
-obj-$(CONFIG_BLK_DEV_BUDDHA)            += buddha.o
-
-ifeq ($(CONFIG_BLK_DEV_IDECS), m)
-        obj-m += ide-cs.o
-endif
-
-ifeq ($(CONFIG_BLK_DEV_PLATFORM), m)
-        obj-m += ide_platform.o
-endif
-
-EXTRA_CFLAGS    := -Idrivers/ide
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/macide.c
index 43f97cc1d30e..43f97cc1d30e 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/macide.c
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile
deleted file mode 100644
index 5873fa0b8769..000000000000
--- a/drivers/ide/mips/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)        += au1xxx-ide.o
-
-EXTRA_CFLAGS    := -Idrivers/ide
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/ns87415.c
index 13789060f407..13789060f407 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/ns87415.c
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/opti621.c
index 6048eda3cd61..6048eda3cd61 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/opti621.c
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 122ed3c072fd..122ed3c072fd 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
deleted file mode 100644
index ab44a1f5f5a9..000000000000
--- a/drivers/ide/pci/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_AEC62XX)           += aec62xx.o
-obj-$(CONFIG_BLK_DEV_ALI15X3)           += alim15x3.o
-obj-$(CONFIG_BLK_DEV_AMD74XX)           += amd74xx.o
-obj-$(CONFIG_BLK_DEV_ATIIXP)            += atiixp.o
-obj-$(CONFIG_BLK_DEV_CELLEB)            += scc_pata.o
-obj-$(CONFIG_BLK_DEV_CMD64X)            += cmd64x.o
-obj-$(CONFIG_BLK_DEV_CS5520)            += cs5520.o
-obj-$(CONFIG_BLK_DEV_CS5530)            += cs5530.o
-obj-$(CONFIG_BLK_DEV_CS5535)            += cs5535.o
-obj-$(CONFIG_BLK_DEV_SC1200)            += sc1200.o
-obj-$(CONFIG_BLK_DEV_CY82C693)          += cy82c693.o
-obj-$(CONFIG_BLK_DEV_DELKIN)            += delkin_cb.o
-obj-$(CONFIG_BLK_DEV_HPT366)            += hpt366.o
-obj-$(CONFIG_BLK_DEV_IT8213)            += it8213.o
-obj-$(CONFIG_BLK_DEV_IT821X)            += it821x.o
-obj-$(CONFIG_BLK_DEV_JMICRON)           += jmicron.o
-obj-$(CONFIG_BLK_DEV_NS87415)           += ns87415.o
-obj-$(CONFIG_BLK_DEV_OPTI621)           += opti621.o
-obj-$(CONFIG_BLK_DEV_PDC202XX_OLD)      += pdc202xx_old.o
-obj-$(CONFIG_BLK_DEV_PDC202XX_NEW)      += pdc202xx_new.o
-obj-$(CONFIG_BLK_DEV_PIIX)              += piix.o
-obj-$(CONFIG_BLK_DEV_RZ1000)            += rz1000.o
-obj-$(CONFIG_BLK_DEV_SVWKS)             += serverworks.o
-obj-$(CONFIG_BLK_DEV_SGIIOC4)           += sgiioc4.o
-obj-$(CONFIG_BLK_DEV_SIIMAGE)           += siimage.o
-obj-$(CONFIG_BLK_DEV_SIS5513)           += sis5513.o
-obj-$(CONFIG_BLK_DEV_SL82C105)          += sl82c105.o
-obj-$(CONFIG_BLK_DEV_SLC90E66)          += slc90e66.o
-obj-$(CONFIG_BLK_DEV_TC86C001)          += tc86c001.o
-obj-$(CONFIG_BLK_DEV_TRIFLEX)           += triflex.o
-obj-$(CONFIG_BLK_DEV_TRM290)            += trm290.o
-obj-$(CONFIG_BLK_DEV_VIA82CXXX)         += via82cxxx.o
-
-# Must appear at the end of the block
-obj-$(CONFIG_BLK_DEV_GENERIC)           += ide-pci-generic.o
-ide-pci-generic-y                       += generic.o
-
-ifeq ($(CONFIG_BLK_DEV_CMD640), m)
-        obj-m += cmd640.o
-endif
-
-EXTRA_CFLAGS    := -Idrivers/ide
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
index 211ae46e3e0c..211ae46e3e0c 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pdc202xx_new.c
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
index 799557c25eef..799557c25eef 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pdc202xx_old.c
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/piix.c
index d63f9fdca76b..d63f9fdca76b 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/piix.c
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/pmac.c
index 2e19d6298536..2e19d6298536 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/pmac.c
diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile
deleted file mode 100644
index 74e52adcdf4b..000000000000
--- a/drivers/ide/ppc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_IDE_PMAC)          += pmac.o
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/q40ide.c
index 4af4a8ce4cdf..4af4a8ce4cdf 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/q40ide.c
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/qd65xx.c
index bc27c7aba936..bc27c7aba936 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/qd65xx.c
diff --git a/drivers/ide/legacy/qd65xx.h b/drivers/ide/qd65xx.h
index c83dea85e621..c83dea85e621 100644
--- a/drivers/ide/legacy/qd65xx.h
+++ b/drivers/ide/qd65xx.h
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/rapide.c
index 78d27d9ae430..78d27d9ae430 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/rapide.c
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/rz1000.c
index 7daf0135cbac..7daf0135cbac 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/rz1000.c
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/sc1200.c
index f1a8758e3a99..f1a8758e3a99 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/sc1200.c
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/scc_pata.c
index 49f163aa51e3..49f163aa51e3 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/scc_pata.c
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/serverworks.c
index 437bc919dafd..437bc919dafd 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/serverworks.c
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/sgiioc4.c
index 8af9b23499fd..8af9b23499fd 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/siimage.c
index eb4faf92c571..eb4faf92c571 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/siimage.c
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/sis5513.c
index ad32e18c5ba3..ad32e18c5ba3 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/sis5513.c
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/sl82c105.c
index 84dc33602ff8..84dc33602ff8 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/sl82c105.c
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/slc90e66.c
index 0f759e4ed779..0f759e4ed779 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/slc90e66.c
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/tc86c001.c
index 93e2cce4b296..93e2cce4b296 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/tc86c001.c
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/triflex.c
index b6ff40336aa9..b6ff40336aa9 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/triflex.c
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/trm290.c
index 75ea61526566..75ea61526566 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/trm290.c
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/umc8672.c
index 1da076e0c917..1da076e0c917 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/umc8672.c
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/via82cxxx.c
index 2a812d3207e9..2a812d3207e9 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c