linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / ide / Makefile

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index eb3c808..569fae7 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -13,15 +13,13 @@ EXTRA_CFLAGS                                += -Idrivers/ide
 
 obj-$(CONFIG_BLK_DEV_IDE)              += pci/
 
-ide-core-y += ide.o ide-default.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
-       ide-taskfile.o
+ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o
 
 ide-core-$(CONFIG_BLK_DEV_CMD640)      += pci/cmd640.o
 
 # Core IDE code - must come before legacy
 ide-core-$(CONFIG_BLK_DEV_IDEPCI)      += setup-pci.o
 ide-core-$(CONFIG_BLK_DEV_IDEDMA)      += ide-dma.o
-ide-core-$(CONFIG_BLK_DEV_IDE_TCQ)     += ide-tcq.o
 ide-core-$(CONFIG_PROC_FS)             += ide-proc.o
 ide-core-$(CONFIG_BLK_DEV_IDEPNP)      += ide-pnp.o
 
@@ -50,6 +48,6 @@ obj-$(CONFIG_BLK_DEV_IDECD)           += ide-cd.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)          += ide-tape.o
 obj-$(CONFIG_BLK_DEV_IDEFLOPPY)                += ide-floppy.o
 
-obj-$(CONFIG_BLK_DEV_IDE)              += legacy/ arm/
+obj-$(CONFIG_BLK_DEV_IDE)              += legacy/ arm/ mips/
 obj-$(CONFIG_BLK_DEV_HD)               += legacy/
 obj-$(CONFIG_ETRAX_IDE)                += cris/