1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 308b8a12f31..ceaf779054e 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -5,24 +5,25 @@
 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-pio-blacklist.o
+              ide-taskfile.o ide-park.o ide-pio-blacklist.o
 
 # core IDE code
 ide-core-$(CONFIG_IDE_TIMINGS)          += ide-timings.o
 ide-core-$(CONFIG_IDE_ATAPI)            += ide-atapi.o
 ide-core-$(CONFIG_BLK_DEV_IDEPCI)       += setup-pci.o
 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
 
-obj-$(CONFIG_BLK_DEV_IDE)               += ide-core.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_BLK_DEV_IDE)               += legacy/ pci/
+obj-$(CONFIG_IDE)                       += legacy/ pci/
 
 obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)       += ide-scan-pci.o
 
@@ -31,15 +32,21 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)
         obj-y += cmd640-core.o
 endif
 
-obj-$(CONFIG_BLK_DEV_IDE)               += ppc/
+obj-$(CONFIG_IDE)                       += ppc/
 obj-$(CONFIG_IDE_H8300)                 += h8300/
 obj-$(CONFIG_IDE_GENERIC)               += ide-generic.o
 obj-$(CONFIG_BLK_DEV_IDEPNP)            += ide-pnp.o
 
+ide-disk_mod-y += ide-disk.o ide-disk_ioctl.o
 ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o
 ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o
 
-obj-$(CONFIG_BLK_DEV_IDEDISK)           += ide-disk.o
+ifeq ($(CONFIG_IDE_PROC_FS), y)
+        ide-disk_mod-y += ide-disk_proc.o
+        ide-floppy_mod-y += ide-floppy_proc.o
+endif
+
+obj-$(CONFIG_BLK_DEV_IDEDISK)           += ide-disk_mod.o
 obj-$(CONFIG_BLK_DEV_IDECD)             += ide-cd_mod.o
 obj-$(CONFIG_BLK_DEV_IDEFLOPPY)         += ide-floppy_mod.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)           += ide-tape.o
@@ -54,4 +61,4 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
         obj-y += ide-platform-core.o
 endif
 
-obj-$(CONFIG_BLK_DEV_IDE)               += arm/ mips/
+obj-$(CONFIG_IDE)                       += arm/ mips/