diff options
-rw-r--r-- | arch/ppc64/kernel/btext.c | 1 | ||||
-rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 4 | ||||
-rw-r--r-- | arch/ppc64/kernel/prom.c | 1 | ||||
-rw-r--r-- | arch/ppc64/kernel/prom_init.c | 1 | ||||
-rw-r--r-- | arch/ppc64/kernel/setup.c | 4 |
5 files changed, 4 insertions, 7 deletions
diff --git a/arch/ppc64/kernel/btext.c b/arch/ppc64/kernel/btext.c index c53f079e9b77..b6fbfbe9032d 100644 --- a/arch/ppc64/kernel/btext.c +++ b/arch/ppc64/kernel/btext.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
8 | #include <linux/string.h> | 8 | #include <linux/string.h> |
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/version.h> | ||
11 | 10 | ||
12 | #include <asm/sections.h> | 11 | #include <asm/sections.h> |
13 | #include <asm/prom.h> | 12 | #include <asm/prom.h> |
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index cb570fd23031..9490b6c5b173 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/ppc64/kernel/pSeries_setup.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
38 | #include <linux/console.h> | 38 | #include <linux/console.h> |
39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
40 | #include <linux/version.h> | 40 | #include <linux/utsname.h> |
41 | #include <linux/adb.h> | 41 | #include <linux/adb.h> |
42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
@@ -272,7 +272,7 @@ static int __init pSeries_init_panel(void) | |||
272 | { | 272 | { |
273 | /* Manually leave the kernel version on the panel. */ | 273 | /* Manually leave the kernel version on the panel. */ |
274 | ppc_md.progress("Linux ppc64\n", 0); | 274 | ppc_md.progress("Linux ppc64\n", 0); |
275 | ppc_md.progress(UTS_RELEASE, 0); | 275 | ppc_md.progress(system_utsname.version, 0); |
276 | 276 | ||
277 | return 0; | 277 | return 0; |
278 | } | 278 | } |
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index b21848826791..6ad5a8467f87 100644 --- a/arch/ppc64/kernel/prom.c +++ b/arch/ppc64/kernel/prom.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/version.h> | ||
26 | #include <linux/threads.h> | 25 | #include <linux/threads.h> |
27 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c index 122283a1d39a..9979919cdf92 100644 --- a/arch/ppc64/kernel/prom_init.c +++ b/arch/ppc64/kernel/prom_init.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/version.h> | ||
26 | #include <linux/threads.h> | 25 | #include <linux/threads.h> |
27 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index aff408bffdd5..d0bb68af0ea4 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/seq_file.h> | 25 | #include <linux/seq_file.h> |
26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
27 | #include <linux/console.h> | 27 | #include <linux/console.h> |
28 | #include <linux/version.h> | 28 | #include <linux/utsname.h> |
29 | #include <linux/tty.h> | 29 | #include <linux/tty.h> |
30 | #include <linux/root_dev.h> | 30 | #include <linux/root_dev.h> |
31 | #include <linux/notifier.h> | 31 | #include <linux/notifier.h> |
@@ -621,7 +621,7 @@ void __init setup_system(void) | |||
621 | smp_release_cpus(); | 621 | smp_release_cpus(); |
622 | #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */ | 622 | #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */ |
623 | 623 | ||
624 | printk("Starting Linux PPC64 %s\n", UTS_RELEASE); | 624 | printk("Starting Linux PPC64 %s\n", system_utsname.version); |
625 | 625 | ||
626 | printk("-----------------------------------------------------\n"); | 626 | printk("-----------------------------------------------------\n"); |
627 | printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size); | 627 | printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size); |