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/kernel | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/kernel')
| -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 98e201c38d2..12fbdbb2d54 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) | |||
| 1555 | compat, sizeof(compat)-1); | 1555 | compat, sizeof(compat)-1); |
| 1556 | if (len <= 0) | 1556 | if (len <= 0) |
| 1557 | return PLATFORM_GENERIC; | 1557 | return PLATFORM_GENERIC; |
| 1558 | if (strncmp(compat, RELOC("chrp"), 4)) | 1558 | if (strcmp(compat, RELOC("chrp"))) |
| 1559 | return PLATFORM_GENERIC; | 1559 | return PLATFORM_GENERIC; |
| 1560 | 1560 | ||
| 1561 | /* Default to pSeries. We need to know if we are running LPAR */ | 1561 | /* Default to pSeries. We need to know if we are running LPAR */ |