X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fplatforms%2Fpseries%2Ffirmware.c;h=29bf83bfb1f086b98f6657357606229b0332c266;hb=f697b677620d04d8c77841745727de85f7e948b1;hp=1c7b2baa5f73cf97758bf681a2420c75865bfaf3;hpb=3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a;p=sfrench%2Fcifs-2.6.git

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 1c7b2baa5f73..29bf83bfb1f0 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -59,6 +59,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
 	{FW_FEATURE_XDABR,		"hcall-xdabr"},
 	{FW_FEATURE_MULTITCE,		"hcall-multi-tce"},
 	{FW_FEATURE_SPLPAR,		"hcall-splpar"},
+	{FW_FEATURE_BULK_REMOVE,	"hcall-bulk"},
 };
 
 /* Build up the firmware features bitmask using the contents of
@@ -79,7 +80,7 @@ void __init fw_feature_init(void)
 		goto out;
 	}
 
-	hypertas = get_property(dn, "ibm,hypertas-functions", &len);
+	hypertas = of_get_property(dn, "ibm,hypertas-functions", &len);
 	if (hypertas == NULL)
 		goto out;