diff options
Diffstat (limited to 'arch/ppc64/kernel/pSeries_setup.c')
-rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index f0f0630cf07c..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 | } |
@@ -397,9 +397,6 @@ static void __init pSeries_init_early(void) | |||
397 | comport = (void *)ioremap(physport, 16); | 397 | comport = (void *)ioremap(physport, 16); |
398 | udbg_init_uart(comport, default_speed); | 398 | udbg_init_uart(comport, default_speed); |
399 | 399 | ||
400 | ppc_md.udbg_putc = udbg_putc; | ||
401 | ppc_md.udbg_getc = udbg_getc; | ||
402 | ppc_md.udbg_getc_poll = udbg_getc_poll; | ||
403 | DBG("Hello World !\n"); | 400 | DBG("Hello World !\n"); |
404 | } | 401 | } |
405 | 402 | ||