Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: remove useless subdirs from drivers/ide/
2026-09-18 18:15:59 +00:00 · 2008-10-23 09:52:39 -07:00 · 2008-10-23 09:52:39 -07:00 · 326528a54f
commit 326528a54f
parent 3e5cce627c 2bfba3c444
117 changed files with 22055 additions and 22098 deletions
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
--- a/drivers/ide/arm/Makefile
+++ b/drivers/ide/arm/Makefile
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
--- a/drivers/ide/h8300/Makefile
+++ b/drivers/ide/h8300/Makefile
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
--- a/drivers/ide/legacy/Makefile
+++ b/drivers/ide/legacy/Makefile
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
--- a/drivers/ide/mips/Makefile
+++ b/drivers/ide/mips/Makefile
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
--- a/drivers/ide/pci/Makefile
+++ b/drivers/ide/pci/Makefile
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
--- a/drivers/ide/ppc/Makefile
+++ b/drivers/ide/ppc/Makefile
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
--- a/drivers/ide/legacy/qd65xx.h
+++ b/drivers/ide/legacy/qd65xx.h
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c