diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 21:26:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 21:26:42 -0700 |
| commit | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (patch) | |
| tree | a30261796868545d6b29ff062332433b460c3e2e /drivers/i2c/busses/i2c-bfin-twi.c | |
| parent | 8d15b0ec32f20a57881dc073b2e8d11dea0ccceb (diff) | |
| parent | 4eaad8ad296a78689f148c8dcd383fc4e51ee123 (diff) | |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-stu300: Make driver depend on MACH_U300
i2c-s3c2410: use resource_size()
i2c: Use resource_size macro
i2c: ST DDC I2C U300 bus driver v3
i2c-bfin-twi: pull in io.h for ioremap()
Diffstat (limited to 'drivers/i2c/busses/i2c-bfin-twi.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-bfin-twi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index 26d8987e69bf..b309ac2c3d5c 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c @@ -12,6 +12,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/i2c.h> +#include <linux/io.h> #include <linux/mm.h> #include <linux/timer.h> #include <linux/spinlock.h> @@ -651,7 +652,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) goto out_error_get_res; } - iface->regs_base = ioremap(res->start, res->end - res->start + 1); + iface->regs_base = ioremap(res->start, resource_size(res)); if (iface->regs_base == NULL) { dev_err(&pdev->dev, "Cannot map IO\n"); rc = -ENXIO; |