diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 21:40:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 21:40:15 -0400 |
| commit | e9e961c9a818a2f24711af493b907a8e40a69efc (patch) | |
| tree | 66960fe0f8085959b53596d4747d1381a2cbc50e /drivers/i2c/busses/i2c-sh_mobile.c | |
| parent | 8aa651e23e2835b6d64381ce17447c995040ab30 (diff) | |
| parent | 593308259bbd335eda9c5280cdd1f7883c746211 (diff) | |
Merge branch 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-for-2631-rc3' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c: Use resource_size
i2c-davinci: behave with i2cdetect
i2c-davinci: convert clock usage after clkdev conversion
Diffstat (limited to 'drivers/i2c/busses/i2c-sh_mobile.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 1c01083b01b5..4f3d99cd1692 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c | |||
| @@ -563,7 +563,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) | |||
| 563 | goto err_irq; | 563 | goto err_irq; |
| 564 | } | 564 | } |
| 565 | 565 | ||
| 566 | size = (res->end - res->start) + 1; | 566 | size = resource_size(res); |
| 567 | 567 | ||
| 568 | pd->reg = ioremap(res->start, size); | 568 | pd->reg = ioremap(res->start, size); |
| 569 | if (pd->reg == NULL) { | 569 | if (pd->reg == NULL) { |