diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2007-01-10 14:45:28 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 18:33:59 +0100 |
commit | 3eb3c740f51c2126b53c2dde974c1c57e634aa7b (patch) | |
tree | bbc9a1152685d8ed97f231e4ff161d01d58f0fe2 /init/Makefile | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-3eb3c740f51c2126b53c2dde974c1c57e634aa7b.tar.xz linux-3eb3c740f51c2126b53c2dde974c1c57e634aa7b.zip |
[PATCH] fix linux banner format string
Revert previous attempts at messing with the linux banner string and
simply use a separate format string for proc.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Andrey Borzenkov <arvidjaar@mail.ru>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init/Makefile')
-rw-r--r-- | init/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/init/Makefile b/init/Makefile index 9cd871ce5784..633a268d270d 100644 --- a/init/Makefile +++ b/init/Makefile @@ -15,6 +15,14 @@ clean-files := ../include/linux/compile.h # dependencies on generated files need to be listed explicitly -$(obj)/main.o: include/linux/compile.h $(obj)/version.o: include/linux/compile.h +# compile.h changes depending on hostname, generation number, etc, +# so we regenerate it always. +# mkcompile_h will make sure to only update the +# actual file if its content has changed. + +include/linux/compile.h: FORCE + @echo ' CHK $@' + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ + "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(CFLAGS)" |