Pull thermal into release branch

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pseries / firmware.c

diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index c01d8f0cbe6d01a6537e0f5f295a3a910d1d892b..29bf83bfb1f086b98f6657357606229b0332c266 100644 (file)
--- 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
@@ -68,7 +69,7 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = {
 void __init fw_feature_init(void)
 {
        struct device_node *dn;
-       char *hypertas, *s;
+       const char *hypertas, *s;
        int len, i;
 
        DBG(" -> fw_feature_init()\n");
@@ -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;