ide: remove useless subdirs from drivers/ide/
Bartlomiej Zolnierkiewicz [Tue, 21 Oct 2008 18:57:23 +0000 (20:57 +0200)]
Suggested-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

62 files changed:
drivers/ide/Makefile
drivers/ide/aec62xx.c [moved from drivers/ide/pci/aec62xx.c with 100% similarity]
drivers/ide/ali14xx.c [moved from drivers/ide/legacy/ali14xx.c with 100% similarity]
drivers/ide/alim15x3.c [moved from drivers/ide/pci/alim15x3.c with 100% similarity]
drivers/ide/amd74xx.c [moved from drivers/ide/pci/amd74xx.c with 100% similarity]
drivers/ide/arm/Makefile [deleted file]
drivers/ide/atiixp.c [moved from drivers/ide/pci/atiixp.c with 100% similarity]
drivers/ide/au1xxx-ide.c [moved from drivers/ide/mips/au1xxx-ide.c with 100% similarity]
drivers/ide/buddha.c [moved from drivers/ide/legacy/buddha.c with 100% similarity]
drivers/ide/cmd640.c [moved from drivers/ide/pci/cmd640.c with 100% similarity]
drivers/ide/cmd64x.c [moved from drivers/ide/pci/cmd64x.c with 100% similarity]
drivers/ide/cs5520.c [moved from drivers/ide/pci/cs5520.c with 100% similarity]
drivers/ide/cs5530.c [moved from drivers/ide/pci/cs5530.c with 100% similarity]
drivers/ide/cs5535.c [moved from drivers/ide/pci/cs5535.c with 100% similarity]
drivers/ide/cy82c693.c [moved from drivers/ide/pci/cy82c693.c with 100% similarity]
drivers/ide/delkin_cb.c [moved from drivers/ide/pci/delkin_cb.c with 100% similarity]
drivers/ide/dtc2278.c [moved from drivers/ide/legacy/dtc2278.c with 100% similarity]
drivers/ide/falconide.c [moved from drivers/ide/legacy/falconide.c with 100% similarity]
drivers/ide/gayle.c [moved from drivers/ide/legacy/gayle.c with 100% similarity]
drivers/ide/generic.c [moved from drivers/ide/pci/generic.c with 100% similarity]
drivers/ide/h8300/Makefile [deleted file]
drivers/ide/hpt366.c [moved from drivers/ide/pci/hpt366.c with 100% similarity]
drivers/ide/ht6560b.c [moved from drivers/ide/legacy/ht6560b.c with 100% similarity]
drivers/ide/icside.c [moved from drivers/ide/arm/icside.c with 100% similarity]
drivers/ide/ide-4drives.c [moved from drivers/ide/legacy/ide-4drives.c with 100% similarity]
drivers/ide/ide-cs.c [moved from drivers/ide/legacy/ide-cs.c with 100% similarity]
drivers/ide/ide-h8300.c [moved from drivers/ide/h8300/ide-h8300.c with 100% similarity]
drivers/ide/ide_arm.c [moved from drivers/ide/arm/ide_arm.c with 100% similarity]
drivers/ide/ide_platform.c [moved from drivers/ide/legacy/ide_platform.c with 100% similarity]
drivers/ide/it8213.c [moved from drivers/ide/pci/it8213.c with 100% similarity]
drivers/ide/it821x.c [moved from drivers/ide/pci/it821x.c with 100% similarity]
drivers/ide/jmicron.c [moved from drivers/ide/pci/jmicron.c with 100% similarity]
drivers/ide/legacy/Makefile [deleted file]
drivers/ide/macide.c [moved from drivers/ide/legacy/macide.c with 100% similarity]
drivers/ide/mips/Makefile [deleted file]
drivers/ide/ns87415.c [moved from drivers/ide/pci/ns87415.c with 100% similarity]
drivers/ide/opti621.c [moved from drivers/ide/pci/opti621.c with 100% similarity]
drivers/ide/palm_bk3710.c [moved from drivers/ide/arm/palm_bk3710.c with 100% similarity]
drivers/ide/pci/Makefile [deleted file]
drivers/ide/pdc202xx_new.c [moved from drivers/ide/pci/pdc202xx_new.c with 100% similarity]
drivers/ide/pdc202xx_old.c [moved from drivers/ide/pci/pdc202xx_old.c with 100% similarity]
drivers/ide/piix.c [moved from drivers/ide/pci/piix.c with 100% similarity]
drivers/ide/pmac.c [moved from drivers/ide/ppc/pmac.c with 100% similarity]
drivers/ide/ppc/Makefile [deleted file]
drivers/ide/q40ide.c [moved from drivers/ide/legacy/q40ide.c with 100% similarity]
drivers/ide/qd65xx.c [moved from drivers/ide/legacy/qd65xx.c with 100% similarity]
drivers/ide/qd65xx.h [moved from drivers/ide/legacy/qd65xx.h with 100% similarity]
drivers/ide/rapide.c [moved from drivers/ide/arm/rapide.c with 100% similarity]
drivers/ide/rz1000.c [moved from drivers/ide/pci/rz1000.c with 100% similarity]
drivers/ide/sc1200.c [moved from drivers/ide/pci/sc1200.c with 100% similarity]
drivers/ide/scc_pata.c [moved from drivers/ide/pci/scc_pata.c with 100% similarity]
drivers/ide/serverworks.c [moved from drivers/ide/pci/serverworks.c with 100% similarity]
drivers/ide/sgiioc4.c [moved from drivers/ide/pci/sgiioc4.c with 100% similarity]
drivers/ide/siimage.c [moved from drivers/ide/pci/siimage.c with 100% similarity]
drivers/ide/sis5513.c [moved from drivers/ide/pci/sis5513.c with 100% similarity]
drivers/ide/sl82c105.c [moved from drivers/ide/pci/sl82c105.c with 100% similarity]
drivers/ide/slc90e66.c [moved from drivers/ide/pci/slc90e66.c with 100% similarity]
drivers/ide/tc86c001.c [moved from drivers/ide/pci/tc86c001.c with 100% similarity]
drivers/ide/triflex.c [moved from drivers/ide/pci/triflex.c with 100% similarity]
drivers/ide/trm290.c [moved from drivers/ide/pci/trm290.c with 100% similarity]
drivers/ide/umc8672.c [moved from drivers/ide/legacy/umc8672.c with 100% similarity]
drivers/ide/via82cxxx.c [moved from drivers/ide/pci/via82cxxx.c with 100% similarity]

index 093d324..9cf92ac 100644 (file)
@@ -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/arm/Makefile b/drivers/ide/arm/Makefile
deleted file mode 100644 (file)
index 5bc2605..0000000
+++ /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/h8300/Makefile b/drivers/ide/h8300/Makefile
deleted file mode 100644 (file)
index 5eba16f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_IDE_H8300)                        += ide-h8300.o
diff --git a/drivers/ide/legacy/Makefile b/drivers/ide/legacy/Makefile
deleted file mode 100644 (file)
index 6939329..0000000
+++ /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/mips/Makefile b/drivers/ide/mips/Makefile
deleted file mode 100644 (file)
index 5873fa0..0000000
+++ /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/Makefile b/drivers/ide/pci/Makefile
deleted file mode 100644 (file)
index ab44a1f..0000000
+++ /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
similarity index 100%
rename from drivers/ide/pci/piix.c
rename to drivers/ide/piix.c
similarity index 100%
rename from drivers/ide/ppc/pmac.c
rename to drivers/ide/pmac.c
diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile
deleted file mode 100644 (file)
index 74e52ad..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_IDE_PMAC)         += pmac.o