diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /arch/powerpc/platforms/pseries | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/platforms/pseries')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 9118d79b7b46..ee89d19c436a 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
| @@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void) | |||
| 255 | { | 255 | { |
| 256 | /* Manually leave the kernel version on the panel. */ | 256 | /* Manually leave the kernel version on the panel. */ |
| 257 | ppc_md.progress("Linux ppc64\n", 0); | 257 | ppc_md.progress("Linux ppc64\n", 0); |
| 258 | ppc_md.progress(system_utsname.version, 0); | 258 | ppc_md.progress(system_utsname.release, 0); |
| 259 | 259 | ||
| 260 | return 0; | 260 | return 0; |
| 261 | } | 261 | } |