Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 273b281fa22c293963ee3e6eec418f5dda2dbc83

Authored by Sam Ravnborg
Committed by Michal Marek
1 parent 264a268380
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

kbuild: move utsrelease.h to include/generated 

Fix up all users of utsrelease.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 17 changed files with 17 additions and 19 deletions Side-by-side Diff

... ... @@ -47,7 +47,6 @@
47 47 #
48 48 include/config
49 49 include/linux/version.h
50   -include/linux/utsrelease.h
51 50 include/generated
52 51  
53 52 # stgit generated dirs
... ... @@ -968,7 +968,7 @@
968 968 # prepare2 creates a makefile if using a separate output directory
969 969 prepare2: prepare3 outputmakefile
970 970  
971   -prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \
  971 +prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
972 972 include/config/auto.conf
973 973 $(cmd_crmodverdir)
974 974  
... ... @@ -1005,7 +1005,7 @@
1005 1005 include/linux/version.h: $(srctree)/Makefile FORCE
1006 1006 $(call filechk,version.h)
1007 1007  
1008   -include/linux/utsrelease.h: include/config/kernel.release FORCE
  1008 +include/generated/utsrelease.h: include/config/kernel.release FORCE
1009 1009 $(call filechk,utsrelease.h)
1010 1010  
1011 1011 PHONY += headerdep
... ... @@ -1151,7 +1151,6 @@
1151 1151 MRPROPER_DIRS += include/config usr/include include/generated
1152 1152 MRPROPER_FILES += .config .config.old .version .old_version \
1153 1153 include/linux/version.h \
1154   - include/linux/utsrelease.h \
1155 1154 Module.symvers Module.markers tags TAGS cscope*
1156 1155  
1157 1156 # clean - Delete most, but leave enough to build external modules
arch/alpha/boot/bootp.c
Diff comments   View file @ 273b281
... ... @@ -9,7 +9,7 @@
9 9 */
10 10 #include <linux/kernel.h>
11 11 #include <linux/string.h>
12   -#include <linux/utsrelease.h>
  12 +#include <generated/utsrelease.h>
13 13 #include <linux/mm.h>
14 14  
15 15 #include <asm/system.h>
arch/alpha/boot/bootpz.c
Diff comments   View file @ 273b281
... ... @@ -11,7 +11,7 @@
11 11 */
12 12 #include <linux/kernel.h>
13 13 #include <linux/string.h>
14   -#include <linux/utsrelease.h>
  14 +#include <generated/utsrelease.h>
15 15 #include <linux/mm.h>
16 16  
17 17 #include <asm/system.h>
arch/alpha/boot/main.c
Diff comments   View file @ 273b281
... ... @@ -7,7 +7,7 @@
7 7 */
8 8 #include <linux/kernel.h>
9 9 #include <linux/string.h>
10   -#include <linux/utsrelease.h>
  10 +#include <generated/utsrelease.h>
11 11 #include <linux/mm.h>
12 12  
13 13 #include <asm/system.h>
arch/frv/kernel/setup.c
Diff comments   View file @ 273b281
... ... @@ -10,7 +10,7 @@
10 10 * 2 of the License, or (at your option) any later version.
11 11 */
12 12  
13   -#include <linux/utsrelease.h>
  13 +#include <generated/utsrelease.h>
14 14 #include <linux/kernel.h>
15 15 #include <linux/sched.h>
16 16 #include <linux/delay.h>
arch/powerpc/platforms/52xx/efika.c
Diff comments   View file @ 273b281
... ... @@ -10,7 +10,7 @@
10 10 */
11 11  
12 12 #include <linux/init.h>
13   -#include <linux/utsrelease.h>
  13 +#include <generated/utsrelease.h>
14 14 #include <linux/pci.h>
15 15 #include <linux/of.h>
16 16 #include <asm/prom.h>
arch/powerpc/platforms/amigaone/setup.c
Diff comments   View file @ 273b281
... ... @@ -14,7 +14,7 @@
14 14  
15 15 #include <linux/kernel.h>
16 16 #include <linux/seq_file.h>
17   -#include <linux/utsrelease.h>
  17 +#include <generated/utsrelease.h>
18 18  
19 19 #include <asm/machdep.h>
20 20 #include <asm/cputable.h>
arch/powerpc/platforms/chrp/setup.c
Diff comments   View file @ 273b281
... ... @@ -23,7 +23,7 @@
23 23 #include <linux/reboot.h>
24 24 #include <linux/init.h>
25 25 #include <linux/pci.h>
26   -#include <linux/utsrelease.h>
  26 +#include <generated/utsrelease.h>
27 27 #include <linux/adb.h>
28 28 #include <linux/module.h>
29 29 #include <linux/delay.h>
arch/powerpc/platforms/powermac/bootx_init.c
Diff comments   View file @ 273b281
... ... @@ -12,7 +12,7 @@
12 12 #include <linux/kernel.h>
13 13 #include <linux/string.h>
14 14 #include <linux/init.h>
15   -#include <linux/utsrelease.h>
  15 +#include <generated/utsrelease.h>
16 16 #include <asm/sections.h>
17 17 #include <asm/prom.h>
18 18 #include <asm/page.h>
arch/x86/boot/header.S
Diff comments   View file @ 273b281
... ... @@ -16,7 +16,7 @@
16 16 */
17 17  
18 18 #include <asm/segment.h>
19   -#include <linux/utsrelease.h>
  19 +#include <generated/utsrelease.h>
20 20 #include <asm/boot.h>
21 21 #include <asm/e820.h>
22 22 #include <asm/page_types.h>
arch/x86/boot/version.c
Diff comments   View file @ 273b281
... ... @@ -13,7 +13,7 @@
13 13 */
14 14  
15 15 #include "boot.h"
16   -#include <linux/utsrelease.h>
  16 +#include <generated/utsrelease.h>
17 17 #include <generated/compile.h>
18 18  
19 19 const char kernel_version[] =
drivers/staging/panel/panel.c
Diff comments   View file @ 273b281
... ... @@ -55,7 +55,7 @@
55 55 #include <linux/list.h>
56 56 #include <linux/notifier.h>
57 57 #include <linux/reboot.h>
58   -#include <linux/utsrelease.h>
  58 +#include <generated/utsrelease.h>
59 59  
60 60 #include <linux/io.h>
61 61 #include <asm/uaccess.h>
include/linux/vermagic.h
Diff comments   View file @ 273b281
1   -#include <linux/utsrelease.h>
  1 +#include <generated/utsrelease.h>
2 2 #include <linux/module.h>
3 3  
4 4 /* Simply sanity version stamp for modules. */
... ... @@ -10,7 +10,7 @@
10 10 #include <linux/module.h>
11 11 #include <linux/uts.h>
12 12 #include <linux/utsname.h>
13   -#include <linux/utsrelease.h>
  13 +#include <generated/utsrelease.h>
14 14 #include <linux/version.h>
15 15  
16 16 #ifndef CONFIG_KALLSYMS
... ... @@ -21,7 +21,7 @@
21 21 #include <linux/hardirq.h>
22 22 #include <linux/elf.h>
23 23 #include <linux/elfcore.h>
24   -#include <linux/utsrelease.h>
  24 +#include <generated/utsrelease.h>
25 25 #include <linux/utsname.h>
26 26 #include <linux/numa.h>
27 27 #include <linux/suspend.h>
kernel/trace/trace.c
Diff comments   View file @ 273b281
... ... @@ -12,7 +12,7 @@
12 12 * Copyright (C) 2004 William Lee Irwin III
13 13 */
14 14 #include <linux/ring_buffer.h>
15   -#include <linux/utsrelease.h>
  15 +#include <generated/utsrelease.h>
16 16 #include <linux/stacktrace.h>
17 17 #include <linux/writeback.h>
18 18 #include <linux/kallsyms.h>