diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 09:03:02 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 13:00:46 +0200 |
| commit | a6359d1eec43d1fd6ffbac958149844873e0084f (patch) | |
| tree | cbb9681ac4f34c6653064ecbd1bdda8f910d40a2 /init/Makefile | |
| parent | e4d59621923ba6c42f30a9d74c7c78d101c2f7aa (diff) | |
| download | linux-3.10-a6359d1eec43d1fd6ffbac958149844873e0084f.tar.gz linux-3.10-a6359d1eec43d1fd6ffbac958149844873e0084f.tar.bz2 linux-3.10-a6359d1eec43d1fd6ffbac958149844873e0084f.zip | |
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/Makefile')
| -rw-r--r-- | init/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/Makefile b/init/Makefile index c55eac955cd..7bc47ee31c3 100644 --- a/init/Makefile +++ b/init/Makefile @@ -9,7 +9,10 @@ else obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o endif obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o -obj-$(CONFIG_HAVE_GENERIC_INIT_TASK) += init_task.o + +ifneq ($(CONFIG_ARCH_INIT_TASK),y) +obj-y += init_task.o +endif mounts-y := do_mounts.o mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o |