Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[linux-2.6] / include / asm-powerpc / firmware.h

diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index 03c2fdff021b593350dbfa1b16c17bd66f564fe0..77069df92bf8f05d80b9ca1e528622d4f6124a27 100644 (file)
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -82,11 +82,11 @@ enum {
 /* This is used to identify firmware features which are available
  * to the kernel.
  */
-extern unsigned long   ppc64_firmware_features;
+extern unsigned long   powerpc_firmware_features;
 
 #define firmware_has_feature(feature)                                  \
        ((FW_FEATURE_ALWAYS & (feature)) ||                             \
-               (FW_FEATURE_POSSIBLE & ppc64_firmware_features & (feature)))
+               (FW_FEATURE_POSSIBLE & powerpc_firmware_features & (feature)))
 
 extern void system_reset_fwnmi(void);
 extern void machine_check_fwnmi(void);