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
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-sis5595.c
diff --git
a/drivers/i2c/busses/i2c-sis5595.c
b/drivers/i2c/busses/i2c-sis5595.c
index
90b7269
..
a5040cc
100644
(file)
--- a/
drivers/i2c/busses/i2c-sis5595.c
+++ b/
drivers/i2c/busses/i2c-sis5595.c
@@
-58,6
+58,7
@@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/init.h>
@@
-239,7
+240,7
@@
static int sis5595_transaction(struct i2c_adapter *adap)
/* 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 = sis5595_read(SMB_STS_LO);
} while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT));
temp = sis5595_read(SMB_STS_LO);
} while (!(temp & 0x40) && (timeout++ < MAX_TIMEOUT));
@@
-360,7
+361,7
@@
static struct i2c_algorithm smbus_algorithm = {
static struct i2c_adapter sis5595_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter sis5595_adapter = {
.owner = THIS_MODULE,
- .class = I2C_
ADAP_CLASS_SMBUS
,
+ .class = I2C_
CLASS_HWMON
,
.name = "unset",
.algo = &smbus_algorithm,
};
.name = "unset",
.algo = &smbus_algorithm,
};