Merge branch 'topic/hda' into for-linus

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

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 9cf92ac939d20508076a4ee3587e8ba2bf2881ad..410728992e6a65d72b1c4e946d7b91487481953b 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -5,7 +5,7 @@
 EXTRA_CFLAGS                           += -Idrivers/ide
 
 ide-core-y += ide.o ide-ioctls.o ide-io.o ide-iops.o ide-lib.o ide-probe.o \
-             ide-taskfile.o ide-park.o ide-pio-blacklist.o
+             ide-taskfile.o ide-pm.o ide-park.o ide-pio-blacklist.o ide-sysfs.o
 
 # core IDE code
 ide-core-$(CONFIG_IDE_TIMINGS)         += ide-timings.o
@@ -15,6 +15,7 @@ ide-core-$(CONFIG_BLK_DEV_IDEDMA)     += ide-dma.o
 ide-core-$(CONFIG_BLK_DEV_IDEDMA_SFF)  += ide-dma-sff.o
 ide-core-$(CONFIG_IDE_PROC_FS)         += ide-proc.o
 ide-core-$(CONFIG_BLK_DEV_IDEACPI)     += ide-acpi.o
+ide-core-$(CONFIG_IDE_LEGACY)          += ide-legacy.o
 
 obj-$(CONFIG_IDE)                      += ide-core.o
 
@@ -68,7 +69,6 @@ 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
 
@@ -111,3 +111,6 @@ obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)    += rapide.o
 obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)  += palm_bk3710.o
 
 obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)       += au1xxx-ide.o
+
+obj-$(CONFIG_BLK_DEV_IDE_TX4938)       += tx4938ide.o
+obj-$(CONFIG_BLK_DEV_IDE_TX4939)       += tx4939ide.o