TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../linux-2.6

Browse Source
This commit is contained in:
Paul Mackerras
2006-05-19 15:02:42 +10:00
parent 4d1f3f25d9 a54c9d30db
commit 3c06da5ae5
288 changed files with 6518 additions and 2684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/prom_init.c
View File

@@ -1555,7 +1555,7 @@ static int __init prom_find_machine_type(void)
compat, sizeof(compat)-1);
if (len <= 0)
return PLATFORM_GENERIC;
if (strncmp(compat, RELOC("chrp"), 4))
if (strcmp(compat, RELOC("chrp")))
return PLATFORM_GENERIC;
/* Default to pSeries. We need to know if we are running LPAR */

2
arch/powerpc/platforms/pseries/setup.c
View File

@@ -255,7 +255,7 @@ static int __init pSeries_init_panel(void)
{
/* Manually leave the kernel version on the panel. */
ppc_md.progress("Linux ppc64\n", 0);
ppc_md.progress(system_utsname.version, 0);
ppc_md.progress(system_utsname.release, 0);
return 0;
}