diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/ide/Makefile | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/ide/Makefile')
| -rw-r--r-- | drivers/ide/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index f94b679b611e..a2b3f84d710d 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile | |||
| @@ -14,6 +14,7 @@ EXTRA_CFLAGS += -Idrivers/ide | |||
| 14 | ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o | 14 | ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o |
| 15 | 15 | ||
| 16 | # core IDE code | 16 | # core IDE code |
| 17 | ide-core-$(CONFIG_IDE_ATAPI) += ide-atapi.o | ||
| 17 | ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o | 18 | ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o |
| 18 | ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o | 19 | ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o |
| 19 | ide-core-$(CONFIG_IDE_PROC_FS) += ide-proc.o | 20 | ide-core-$(CONFIG_IDE_PROC_FS) += ide-proc.o |