diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:03:02 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:46 -0400 |
commit | a6359d1eec43d1fd6ffbac958149844873e0084f (patch) | |
tree | cbb9681ac4f34c6653064ecbd1bdda8f910d40a2 /init | |
parent | e4d59621923ba6c42f30a9d74c7c78d101c2f7aa (diff) |
init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK
Now that all archs except ia64 are converted, replace the config and
let the ia64 select CONFIG_ARCH_INIT_TASK
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20120503085035.867948914@linutronix.de
Diffstat (limited to 'init')
-rw-r--r-- | init/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/Makefile b/init/Makefile index c55eac955cdc..7bc47ee31c36 100644 --- a/init/Makefile +++ b/init/Makefile | |||
@@ -9,7 +9,10 @@ else | |||
9 | obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o | 9 | obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o |
10 | endif | 10 | endif |
11 | obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o | 11 | obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o |
12 | obj-$(CONFIG_HAVE_GENERIC_INIT_TASK) += init_task.o | 12 | |
13 | ifneq ($(CONFIG_ARCH_INIT_TASK),y) | ||
14 | obj-y += init_task.o | ||
15 | endif | ||
13 | 16 | ||
14 | mounts-y := do_mounts.o | 17 | mounts-y := do_mounts.o |
15 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o | 18 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o |