diff options
Diffstat (limited to 'arch/powerpc/platforms/iseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 3ecc4a652d82..b08c3686f903 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -303,8 +303,6 @@ static void __init iSeries_init_early(void) | |||
303 | { | 303 | { |
304 | DBG(" -> iSeries_init_early()\n"); | 304 | DBG(" -> iSeries_init_early()\n"); |
305 | 305 | ||
306 | ppc64_firmware_features = FW_FEATURE_ISERIES; | ||
307 | |||
308 | ppc64_interrupt_controller = IC_ISERIES; | 306 | ppc64_interrupt_controller = IC_ISERIES; |
309 | 307 | ||
310 | #if defined(CONFIG_BLK_DEV_INITRD) | 308 | #if defined(CONFIG_BLK_DEV_INITRD) |
@@ -711,7 +709,13 @@ void __init iSeries_init_IRQ(void) { } | |||
711 | 709 | ||
712 | static int __init iseries_probe(int platform) | 710 | static int __init iseries_probe(int platform) |
713 | { | 711 | { |
714 | return PLATFORM_ISERIES_LPAR == platform; | 712 | if (PLATFORM_ISERIES_LPAR != platform) |
713 | return 0; | ||
714 | |||
715 | ppc64_firmware_features |= FW_FEATURE_ISERIES; | ||
716 | ppc64_firmware_features |= FW_FEATURE_LPAR; | ||
717 | |||
718 | return 1; | ||
715 | } | 719 | } |
716 | 720 | ||
717 | struct machdep_calls __initdata iseries_md = { | 721 | struct machdep_calls __initdata iseries_md = { |