diff options
author | Paul Mackerras <paulus@samba.org> | 2006-05-19 07:02:42 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 07:02:42 +0200 |
commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /arch/powerpc/kernel/prom_init.c | |
parent | [PATCH] powerpc: Auto reserve of device tree blob (diff) | |
parent | [PATCH] ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices (diff) | |
download | linux-3c06da5ae5358e9d325d541a053e1059e9654bcc.tar.xz linux-3c06da5ae5358e9d325d541a053e1059e9654bcc.zip |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 98e201c38d27..12fbdbb2d54a 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -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 */ |