projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[powerpc.git]
/
drivers
/
hwmon
/
ams
/
ams-i2c.c
diff --git
a/drivers/hwmon/ams/ams-i2c.c
b/drivers/hwmon/ams/ams-i2c.c
index
5c70f2e
..
9577605
100644
(file)
--- a/
drivers/hwmon/ams/ams-i2c.c
+++ b/
drivers/hwmon/ams/ams-i2c.c
@@
-276,7
+276,7
@@
int __init ams_i2c_init(struct device_node *np)
ams_info.bustype = BUS_I2C;
/* look for bus either using "reg" or by path */
- prop = get_property(ams_info.of_node, "reg", NULL);
+ prop =
of_
get_property(ams_info.of_node, "reg", NULL);
if (!prop) {
result = -ENODEV;