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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-savage4.c
diff --git
a/drivers/i2c/busses/i2c-savage4.c
b/drivers/i2c/busses/i2c-savage4.c
index
092d032
..
844b4ff
100644
(file)
--- a/
drivers/i2c/busses/i2c-savage4.c
+++ b/
drivers/i2c/busses/i2c-savage4.c
@@
-29,7
+29,6
@@
it easier to add later.
*/
it easier to add later.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-141,7
+140,6
@@
static struct i2c_algo_bit_data sav_i2c_bit_data = {
.getsda = bit_savi2c_getsda,
.getscl = bit_savi2c_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_savi2c_getsda,
.getscl = bit_savi2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT
};
.timeout = TIMEOUT
};
@@
-175,7
+173,7
@@
static int __devinit savage4_probe(struct pci_dev *dev, const struct pci_device_
static void __devexit savage4_remove(struct pci_dev *dev)
{
static void __devexit savage4_remove(struct pci_dev *dev)
{
- i2c_
bit_del_bus
(&savage4_i2c_adapter);
+ i2c_
del_adapter
(&savage4_i2c_adapter);
iounmap(ioaddr);
}
iounmap(ioaddr);
}