diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 |
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /arch/powerpc/kernel/prom_init.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d66c5e77fcff..7e4d54821a07 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
| @@ -1528,12 +1528,11 @@ static int __init prom_find_machine_type(void) | |||
| 1528 | * non-IBM designs ! | 1528 | * non-IBM designs ! |
| 1529 | * - it has /rtas | 1529 | * - it has /rtas |
| 1530 | */ | 1530 | */ |
| 1531 | len = prom_getprop(_prom->root, "model", | 1531 | len = prom_getprop(_prom->root, "device_type", |
| 1532 | compat, sizeof(compat)-1); | 1532 | compat, sizeof(compat)-1); |
| 1533 | if (len <= 0) | 1533 | if (len <= 0) |
| 1534 | return PLATFORM_GENERIC; | 1534 | return PLATFORM_GENERIC; |
| 1535 | compat[len] = 0; | 1535 | if (strncmp(compat, RELOC("chrp"), 4)) |
| 1536 | if (strcmp(compat, "chrp")) | ||
| 1537 | return PLATFORM_GENERIC; | 1536 | return PLATFORM_GENERIC; |
| 1538 | 1537 | ||
| 1539 | /* Default to pSeries. We need to know if we are running LPAR */ | 1538 | /* Default to pSeries. We need to know if we are running LPAR */ |