git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 90522e3c9d46b1979eb86d738fe7c0b7c62718a9..29bf83bfb1f086b98f6657357606229b0332c266 100644
(file)
--- a/
arch/powerpc/platforms/pseries/firmware.c
+++ b/
arch/powerpc/platforms/pseries/firmware.c
@@
-80,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;