projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
[platform/kernel/linux-starfive.git]
/
drivers
/
macintosh
/
windfarm_max6690_sensor.c
diff --git
a/drivers/macintosh/windfarm_max6690_sensor.c
b/drivers/macintosh/windfarm_max6690_sensor.c
index
8e99d40
..
5f03aab
100644
(file)
--- a/
drivers/macintosh/windfarm_max6690_sensor.c
+++ b/
drivers/macintosh/windfarm_max6690_sensor.c
@@
-11,7
+11,6
@@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/i2c.h>
-#include <linux/i2c-dev.h>
#include <asm/prom.h>
#include <asm/pmac_low_i2c.h>
#include <asm/prom.h>
#include <asm/pmac_low_i2c.h>
@@
-132,10
+131,10
@@
static int wf_max6690_attach(struct i2c_adapter *adapter)
*/
if (!pmac_i2c_match_adapter(dev, adapter))
continue;
*/
if (!pmac_i2c_match_adapter(dev, adapter))
continue;
- if (!device_is_compatible(dev, "max6690"))
+ if (!
of_
device_is_compatible(dev, "max6690"))
continue;
addr = pmac_i2c_get_dev_addr(dev);
continue;
addr = pmac_i2c_get_dev_addr(dev);
- loc = get_property(dev, "hwsensor-location", NULL);
+ loc =
of_
get_property(dev, "hwsensor-location", NULL);
if (loc == NULL || addr == 0)
continue;
printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);
if (loc == NULL || addr == 0)
continue;
printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);