Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / arch / powerpc / platforms / pseries / firmware.c

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 989f4bc..c01d8f0 100644 (file)
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -91,7 +91,7 @@ void __init fw_feature_init(void)
                                continue;
 
                        /* we have a match */
-                       ppc64_firmware_features |=
+                       powerpc_firmware_features |=
                                firmware_features_table[i].val;
                        break;
                }