From 5a835a805e992ea33ddab7e9f31420969c2f6053 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 23 Mar 2006 23:33:03 +1100
Subject: [PATCH] --- yaml --- r: 24599 b: refs/heads/master c:
 dd4d7bfad635dddc56b74dab1894ef01c8c836e1 h: refs/heads/master i:   24597:
 8d054b1e809798f3949f4f2c17bcc314c0063135   24595:
 c138de769f544037e69f8e455a3d39f3357d9505   24591:
 9ef0676805dd89fe8dabec57f0b20b935cbe8c0c v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-powerpc/firmware.h | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

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);