[POWERPC] iseries: eliminate a couple of warnings

[karo-tx-linux.git] / include / asm-powerpc / firmware.h

diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index ce3788224ed0e1f8cfdc0d3ad886cb9dfd0a9f4e..77069df92bf8f05d80b9ca1e528622d4f6124a27 100644 (file)
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -82,13 +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;
 
-static inline unsigned long firmware_has_feature(unsigned long feature)
-{
-       return (FW_FEATURE_ALWAYS & feature) ||
-               (FW_FEATURE_POSSIBLE & ppc64_firmware_features & feature);
-}
+#define firmware_has_feature(feature)                                  \
+       ((FW_FEATURE_ALWAYS & (feature)) ||                             \
+               (FW_FEATURE_POSSIBLE & powerpc_firmware_features & (feature)))
 
 extern void system_reset_fwnmi(void);
 extern void machine_check_fwnmi(void);