aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/Makefile
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:33 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:33 -0400
commit452a8ed8ce752a423013cfade1bbca5f13fd16eb (patch)
treecb83974126b7638c5b9ef7d341f78af85481fbbd /drivers/ide/Makefile
parentbaf08f0be6d986521bb2fbdc7af51fc4847da734 (diff)
ide: remove CONFIG_BLK_DEV_IDE config option (take 2)
Because hd.c was moved to drivers/block/ this config option is superfluous now and may be removed. v2: Fix drivers/ide/Makefile (noticed by Adrian Bunk). Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/Makefile')
-rw-r--r--drivers/ide/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index 308b8a12f314..f408983f89f3 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -15,14 +15,14 @@ ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o
15ide-core-$(CONFIG_IDE_PROC_FS) += ide-proc.o 15ide-core-$(CONFIG_IDE_PROC_FS) += ide-proc.o
16ide-core-$(CONFIG_BLK_DEV_IDEACPI) += ide-acpi.o 16ide-core-$(CONFIG_BLK_DEV_IDEACPI) += ide-acpi.o
17 17
18obj-$(CONFIG_BLK_DEV_IDE) += ide-core.o 18obj-$(CONFIG_IDE) += ide-core.o
19 19
20ifeq ($(CONFIG_IDE_ARM), y) 20ifeq ($(CONFIG_IDE_ARM), y)
21 ide-arm-core-y += arm/ide_arm.o 21 ide-arm-core-y += arm/ide_arm.o
22 obj-y += ide-arm-core.o 22 obj-y += ide-arm-core.o
23endif 23endif
24 24
25obj-$(CONFIG_BLK_DEV_IDE) += legacy/ pci/ 25obj-$(CONFIG_IDE) += legacy/ pci/
26 26
27obj-$(CONFIG_IDEPCI_PCIBUS_ORDER) += ide-scan-pci.o 27obj-$(CONFIG_IDEPCI_PCIBUS_ORDER) += ide-scan-pci.o
28 28
@@ -31,7 +31,7 @@ ifeq ($(CONFIG_BLK_DEV_CMD640), y)
31 obj-y += cmd640-core.o 31 obj-y += cmd640-core.o
32endif 32endif
33 33
34obj-$(CONFIG_BLK_DEV_IDE) += ppc/ 34obj-$(CONFIG_IDE) += ppc/
35obj-$(CONFIG_IDE_H8300) += h8300/ 35obj-$(CONFIG_IDE_H8300) += h8300/
36obj-$(CONFIG_IDE_GENERIC) += ide-generic.o 36obj-$(CONFIG_IDE_GENERIC) += ide-generic.o
37obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o 37obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o
@@ -54,4 +54,4 @@ ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
54 obj-y += ide-platform-core.o 54 obj-y += ide-platform-core.o
55endif 55endif
56 56
57obj-$(CONFIG_BLK_DEV_IDE) += arm/ mips/ 57obj-$(CONFIG_IDE) += arm/ mips/