git.openpandora.org
/
pandora-kernel.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
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-sis5595.c
diff --git
a/drivers/i2c/busses/i2c-sis5595.c
b/drivers/i2c/busses/i2c-sis5595.c
index
38bbfd8
..
a6feed4
100644
(file)
--- a/
drivers/i2c/busses/i2c-sis5595.c
+++ b/
drivers/i2c/busses/i2c-sis5595.c
@@
-365,6
+365,7
@@
static const struct i2c_algorithm smbus_algorithm = {
static struct i2c_adapter sis5595_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter sis5595_adapter = {
.owner = THIS_MODULE,
+ .id = I2C_HW_SMBUS_SIS5595,
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
};
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
};
@@
-383,7
+384,7
@@
static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
return -ENODEV;
}
return -ENODEV;
}
- /* set up the
driver
fs linkage to our parent device */
+ /* set up the
sys
fs linkage to our parent device */
sis5595_adapter.dev.parent = &dev->dev;
sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
sis5595_adapter.dev.parent = &dev->dev;
sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",