git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-sis96x.c
diff --git
a/drivers/i2c/busses/i2c-sis96x.c
b/drivers/i2c/busses/i2c-sis96x.c
index
c1d456b
..
d605dee
100644
(file)
--- a/
drivers/i2c/busses/i2c-sis96x.c
+++ b/
drivers/i2c/busses/i2c-sis96x.c
@@
-36,6
+36,7
@@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
+#include <linux/delay.h>
#include <linux/stddef.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/stddef.h>
#include <linux/sched.h>
#include <linux/ioport.h>
@@
-139,7
+140,7
@@
static int sis96x_transaction(int size)
/* We will always wait for a fraction of a second! */
do {
/* We will always wait for a fraction of a second! */
do {
-
i2c_delay
(1);
+
msleep
(1);
temp = sis96x_read(SMB_STS);
} while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));
temp = sis96x_read(SMB_STS);
} while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));
@@
-260,7
+261,7
@@
static struct i2c_algorithm smbus_algorithm = {
static struct i2c_adapter sis96x_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter sis96x_adapter = {
.owner = THIS_MODULE,
- .class = I2C_
ADAP_CLASS_SMBUS
,
+ .class = I2C_
CLASS_HWMON
,
.algo = &smbus_algorithm,
.name = "unset",
};
.algo = &smbus_algorithm,
.name = "unset",
};
@@
-338,7
+339,7
@@
static void __devexit sis96x_remove(struct pci_dev *dev)
}
static struct pci_driver sis96x_driver = {
}
static struct pci_driver sis96x_driver = {
- .name = "sis96x
smbus",
+ .name = "sis96x
_
smbus",
.id_table = sis96x_ids,
.probe = sis96x_probe,
.remove = __devexit_p(sis96x_remove),
.id_table = sis96x_ids,
.probe = sis96x_probe,
.remove = __devexit_p(sis96x_remove),