[PATCH] libertas: remove adapter->nullpktinterval

[safe/jmp/linux-2.6] / drivers / ide / Makefile

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 5be8ad6..75dc696 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -20,9 +20,9 @@ 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_IDE_PROC_FS)         += ide-proc.o
 ide-core-$(CONFIG_BLK_DEV_IDEPNP)      += ide-pnp.o
+ide-core-$(CONFIG_BLK_DEV_IDEACPI)     += ide-acpi.o
 
 # built-in only drivers from arm/
 ide-core-$(CONFIG_IDE_ARM)             += arm/ide_arm.o
@@ -49,6 +49,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/