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
[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-acorn.c
diff --git
a/drivers/i2c/busses/i2c-acorn.c
b/drivers/i2c/busses/i2c-acorn.c
index
9fee3ca
..
8679648
100644
(file)
--- a/
drivers/i2c/busses/i2c-acorn.c
+++ b/
drivers/i2c/busses/i2c-acorn.c
@@
-15,9
+15,9
@@
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
+#include <linux/io.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/hardware/ioc.h>
#include <asm/system.h>
#include <asm/hardware/ioc.h>
#include <asm/system.h>
@@
-79,10
+79,11
@@
static struct i2c_algo_bit_data ioc_data = {
.getsda = ioc_getsda,
.getscl = ioc_getscl,
.udelay = 80,
.getsda = ioc_getsda,
.getscl = ioc_getscl,
.udelay = 80,
- .timeout =
100
+ .timeout =
HZ,
};
static struct i2c_adapter ioc_ops = {
};
static struct i2c_adapter ioc_ops = {
+ .nr = 0,
.algo_data = &ioc_data,
};
.algo_data = &ioc_data,
};
@@
-90,7
+91,7
@@
static int __init i2c_ioc_init(void)
{
force_ones = FORCE_ONES | SCL | SDA;
{
force_ones = FORCE_ONES | SCL | SDA;
- return i2c_bit_add_bus(&ioc_ops);
+ return i2c_bit_add_
numbered_
bus(&ioc_ops);
}
module_init(i2c_ioc_init);
}
module_init(i2c_ioc_init);