diff --git a/[refs] b/[refs]
index 9c1bb9a38a32..2f33b4e5dd56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f94b85f98a346c5eb0ac0d9539b71cb7057143
+refs/heads/master: dd4d7bfad635dddc56b74dab1894ef01c8c836e1
diff --git a/trunk/include/asm-powerpc/firmware.h b/trunk/include/asm-powerpc/firmware.h
index ce3788224ed0..03c2fdff021b 100644
--- a/trunk/include/asm-powerpc/firmware.h
+++ b/trunk/include/asm-powerpc/firmware.h
@@ -84,11 +84,9 @@ enum {
  */
 extern unsigned long	ppc64_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 & ppc64_firmware_features & (feature)))
 
 extern void system_reset_fwnmi(void);
 extern void machine_check_fwnmi(void);