Merge branch 'linus' into oprofile-v2

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

diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 5d414e301a5a9c319a23e9da0463ca0231035e5c..308b8a12f314b758ac28d3e8c44d67d8ec671d85 100644 (file)
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -1,18 +1,11 @@
 #
-# Makefile for the kernel ata, atapi, and ide block device drivers.
-#
-# 12 September 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org>
-# Rewritten to use lists instead of if-statements.
-#
-# Note : at this point, these files are compiled on all systems.
-# In the future, some of these should be built conditionally.
-#
 # link order is important here
+#
 
 EXTRA_CFLAGS                           += -Idrivers/ide
 
-ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o \
-             ide-pio-blacklist.o
+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
 
 # core IDE code
 ide-core-$(CONFIG_IDE_TIMINGS)         += ide-timings.o
@@ -44,11 +37,12 @@ obj-$(CONFIG_IDE_GENERIC)           += ide-generic.o
 obj-$(CONFIG_BLK_DEV_IDEPNP)           += ide-pnp.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
 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
-obj-$(CONFIG_BLK_DEV_IDEFLOPPY)                += ide-floppy.o
 
 ifeq ($(CONFIG_BLK_DEV_IDECS), y)
        ide-cs-core-y += legacy/ide-cs.o