diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-10-18 00:36:47 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2009-12-12 13:08:14 +0100 |
| commit | 92045954058671fdd0ccf031ca06611ce1d929d1 (patch) | |
| tree | 912826bc7e042a52ac688bc3de233b898a91cb1e /init | |
| parent | f7f16b7799ed68654850ab340ef812895aebcf4c (diff) | |
| download | kernel_samsung_smdk4412-92045954058671fdd0ccf031ca06611ce1d929d1.tar.gz kernel_samsung_smdk4412-92045954058671fdd0ccf031ca06611ce1d929d1.tar.bz2 kernel_samsung_smdk4412-92045954058671fdd0ccf031ca06611ce1d929d1.zip | |
kbuild: move compile.h to include/generated
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Makefile | 8 | ||||
| -rw-r--r-- | init/version.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/init/Makefile b/init/Makefile index 4a243df426f..0bf677aa087 100644 --- a/init/Makefile +++ b/init/Makefile @@ -15,12 +15,8 @@ mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o -# files to be removed upon make clean -clean-files := ../include/linux/compile.h - # dependencies on generated files need to be listed explicitly - -$(obj)/version.o: include/linux/compile.h +$(obj)/version.o: include/generated/compile.h # compile.h changes depending on hostname, generation number, etc, # so we regenerate it always. @@ -30,7 +26,7 @@ $(obj)/version.o: include/linux/compile.h chk_compile.h = : quiet_chk_compile.h = echo ' CHK $@' silent_chk_compile.h = : -include/linux/compile.h: FORCE +include/generated/compile.h: FORCE @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" diff --git a/init/version.c b/init/version.c index 52a8b98642b..82328aaca1e 100644 --- a/init/version.c +++ b/init/version.c @@ -6,7 +6,7 @@ * May be freely distributed as part of Linux. */ -#include <linux/compile.h> +#include <generated/compile.h> #include <linux/module.h> #include <linux/uts.h> #include <linux/utsname.h> |