ide: remove useless subdirs from drivers/ide/

Suggested-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
airlied · Oct 21, 2008 · 2bfba3c · 2bfba3c
1 parent 2515ddc
commit 2bfba3c
Show file tree

Hide file tree

Showing 62 changed files with 63 additions and 106 deletions.
diff --git 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 → drivers/ide/aec62xx.c b/drivers/ide/pci/aec62xx.c → drivers/ide/aec62xx.c
diff --git a/drivers/ide/legacy/ali14xx.c → drivers/ide/ali14xx.c b/drivers/ide/legacy/ali14xx.c → drivers/ide/ali14xx.c
diff --git a/drivers/ide/pci/alim15x3.c → drivers/ide/alim15x3.c b/drivers/ide/pci/alim15x3.c → drivers/ide/alim15x3.c
diff --git a/drivers/ide/pci/amd74xx.c → drivers/ide/amd74xx.c b/drivers/ide/pci/amd74xx.c → drivers/ide/amd74xx.c
diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile
diff --git a/drivers/ide/pci/atiixp.c → drivers/ide/atiixp.c b/drivers/ide/pci/atiixp.c → drivers/ide/atiixp.c
diff --git a/drivers/ide/mips/au1xxx-ide.c → drivers/ide/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c → drivers/ide/au1xxx-ide.c
diff --git a/drivers/ide/legacy/buddha.c → drivers/ide/buddha.c b/drivers/ide/legacy/buddha.c → drivers/ide/buddha.c
diff --git a/drivers/ide/pci/cmd640.c → drivers/ide/cmd640.c b/drivers/ide/pci/cmd640.c → drivers/ide/cmd640.c
diff --git a/drivers/ide/pci/cmd64x.c → drivers/ide/cmd64x.c b/drivers/ide/pci/cmd64x.c → drivers/ide/cmd64x.c
diff --git a/drivers/ide/pci/cs5520.c → drivers/ide/cs5520.c b/drivers/ide/pci/cs5520.c → drivers/ide/cs5520.c
diff --git a/drivers/ide/pci/cs5530.c → drivers/ide/cs5530.c b/drivers/ide/pci/cs5530.c → drivers/ide/cs5530.c
diff --git a/drivers/ide/pci/cs5535.c → drivers/ide/cs5535.c b/drivers/ide/pci/cs5535.c → drivers/ide/cs5535.c
diff --git a/drivers/ide/pci/cy82c693.c → drivers/ide/cy82c693.c b/drivers/ide/pci/cy82c693.c → drivers/ide/cy82c693.c
diff --git a/drivers/ide/pci/delkin_cb.c → drivers/ide/delkin_cb.c b/drivers/ide/pci/delkin_cb.c → drivers/ide/delkin_cb.c
diff --git a/drivers/ide/legacy/dtc2278.c → drivers/ide/dtc2278.c b/drivers/ide/legacy/dtc2278.c → drivers/ide/dtc2278.c
diff --git a/drivers/ide/legacy/falconide.c → drivers/ide/falconide.c b/drivers/ide/legacy/falconide.c → drivers/ide/falconide.c
diff --git a/drivers/ide/legacy/gayle.c → drivers/ide/gayle.c b/drivers/ide/legacy/gayle.c → drivers/ide/gayle.c
diff --git a/drivers/ide/pci/generic.c → drivers/ide/generic.c b/drivers/ide/pci/generic.c → drivers/ide/generic.c
diff --git a/drivers/ide/h8300/Makefile b/drivers/ide/h8300/Makefile
diff --git a/drivers/ide/pci/hpt366.c → drivers/ide/hpt366.c b/drivers/ide/pci/hpt366.c → drivers/ide/hpt366.c
diff --git a/drivers/ide/legacy/ht6560b.c → drivers/ide/ht6560b.c b/drivers/ide/legacy/ht6560b.c → drivers/ide/ht6560b.c
diff --git a/drivers/ide/arm/icside.c → drivers/ide/icside.c b/drivers/ide/arm/icside.c → drivers/ide/icside.c
diff --git a/drivers/ide/legacy/ide-4drives.c → drivers/ide/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c → drivers/ide/ide-4drives.c
diff --git a/drivers/ide/legacy/ide-cs.c → drivers/ide/ide-cs.c b/drivers/ide/legacy/ide-cs.c → drivers/ide/ide-cs.c
diff --git a/drivers/ide/h8300/ide-h8300.c → drivers/ide/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c → drivers/ide/ide-h8300.c
diff --git a/drivers/ide/arm/ide_arm.c → drivers/ide/ide_arm.c b/drivers/ide/arm/ide_arm.c → drivers/ide/ide_arm.c
diff --git a/drivers/ide/legacy/ide_platform.c → drivers/ide/ide_platform.c b/drivers/ide/legacy/ide_platform.c → drivers/ide/ide_platform.c
diff --git a/drivers/ide/pci/it8213.c → drivers/ide/it8213.c b/drivers/ide/pci/it8213.c → drivers/ide/it8213.c
diff --git a/drivers/ide/pci/it821x.c → drivers/ide/it821x.c b/drivers/ide/pci/it821x.c → drivers/ide/it821x.c
diff --git a/drivers/ide/pci/jmicron.c → drivers/ide/jmicron.c b/drivers/ide/pci/jmicron.c → drivers/ide/jmicron.c
diff --git a/drivers/ide/legacy/Makefile b/drivers/ide/legacy/Makefile
diff --git a/drivers/ide/legacy/macide.c → drivers/ide/macide.c b/drivers/ide/legacy/macide.c → drivers/ide/macide.c
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile
diff --git a/drivers/ide/pci/ns87415.c → drivers/ide/ns87415.c b/drivers/ide/pci/ns87415.c → drivers/ide/ns87415.c
diff --git a/drivers/ide/pci/opti621.c → drivers/ide/opti621.c b/drivers/ide/pci/opti621.c → drivers/ide/opti621.c
diff --git a/drivers/ide/arm/palm_bk3710.c → drivers/ide/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c → drivers/ide/palm_bk3710.c
diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
diff --git a/drivers/ide/pci/pdc202xx_new.c → drivers/ide/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c → drivers/ide/pdc202xx_new.c
diff --git a/drivers/ide/pci/pdc202xx_old.c → drivers/ide/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c → drivers/ide/pdc202xx_old.c
diff --git a/drivers/ide/pci/piix.c → drivers/ide/piix.c b/drivers/ide/pci/piix.c → drivers/ide/piix.c
diff --git a/drivers/ide/ppc/pmac.c → drivers/ide/pmac.c b/drivers/ide/ppc/pmac.c → drivers/ide/pmac.c
diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile
diff --git a/drivers/ide/legacy/q40ide.c → drivers/ide/q40ide.c b/drivers/ide/legacy/q40ide.c → drivers/ide/q40ide.c
diff --git a/drivers/ide/legacy/qd65xx.c → drivers/ide/qd65xx.c b/drivers/ide/legacy/qd65xx.c → drivers/ide/qd65xx.c
diff --git a/drivers/ide/legacy/qd65xx.h → drivers/ide/qd65xx.h b/drivers/ide/legacy/qd65xx.h → drivers/ide/qd65xx.h
diff --git a/drivers/ide/arm/rapide.c → drivers/ide/rapide.c b/drivers/ide/arm/rapide.c → drivers/ide/rapide.c
diff --git a/drivers/ide/pci/rz1000.c → drivers/ide/rz1000.c b/drivers/ide/pci/rz1000.c → drivers/ide/rz1000.c
diff --git a/drivers/ide/pci/sc1200.c → drivers/ide/sc1200.c b/drivers/ide/pci/sc1200.c → drivers/ide/sc1200.c
diff --git a/drivers/ide/pci/scc_pata.c → drivers/ide/scc_pata.c b/drivers/ide/pci/scc_pata.c → drivers/ide/scc_pata.c
diff --git a/drivers/ide/pci/serverworks.c → drivers/ide/serverworks.c b/drivers/ide/pci/serverworks.c → drivers/ide/serverworks.c
diff --git a/drivers/ide/pci/sgiioc4.c → drivers/ide/sgiioc4.c b/drivers/ide/pci/sgiioc4.c → drivers/ide/sgiioc4.c
diff --git a/drivers/ide/pci/siimage.c → drivers/ide/siimage.c b/drivers/ide/pci/siimage.c → drivers/ide/siimage.c
diff --git a/drivers/ide/pci/sis5513.c → drivers/ide/sis5513.c b/drivers/ide/pci/sis5513.c → drivers/ide/sis5513.c
diff --git a/drivers/ide/pci/sl82c105.c → drivers/ide/sl82c105.c b/drivers/ide/pci/sl82c105.c → drivers/ide/sl82c105.c
diff --git a/drivers/ide/pci/slc90e66.c → drivers/ide/slc90e66.c b/drivers/ide/pci/slc90e66.c → drivers/ide/slc90e66.c
diff --git a/drivers/ide/pci/tc86c001.c → drivers/ide/tc86c001.c b/drivers/ide/pci/tc86c001.c → drivers/ide/tc86c001.c
diff --git a/drivers/ide/pci/triflex.c → drivers/ide/triflex.c b/drivers/ide/pci/triflex.c → drivers/ide/triflex.c
diff --git a/drivers/ide/pci/trm290.c → drivers/ide/trm290.c b/drivers/ide/pci/trm290.c → drivers/ide/trm290.c
diff --git a/drivers/ide/legacy/umc8672.c → drivers/ide/umc8672.c b/drivers/ide/legacy/umc8672.c → drivers/ide/umc8672.c
diff --git a/drivers/ide/pci/via82cxxx.c → drivers/ide/via82cxxx.c b/drivers/ide/pci/via82cxxx.c → drivers/ide/via82cxxx.c