diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:40:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:40:57 -0800 |
| commit | fe3c560b8a22cb28e54fe8950abef38e88d75831 (patch) | |
| tree | 88db8742152559e1840832970066816e72a9009b /drivers/i2c/busses/i2c-iop3xx.h | |
| parent | d20056032e20061db6583f517a4d3ea4492a94f1 (diff) | |
| parent | dad92924ea4c9167e64a2835ec9310c73570b10b (diff) | |
Merge branch 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux:
i2c-bfin-twi: move setup to the earlier subsys initcall
i2c-bfin-twi: handle faulty slave devices better
i2c-mv64xxx: send repeated START between messages in xfer
i2c-nomadik: fix regression on adapter name
i2c-omap: Set latency requirements only once for several messages
i2c-eg20t: add driver for Intel EG20T
i2c-ocores: add some device tree documentation
i2c-ocores: Use devres for resource allocation
i2c-ocores: Adapt for device tree
i2c-iop3xx: add iomem annotation
Diffstat (limited to 'drivers/i2c/busses/i2c-iop3xx.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h index 8485861f6a36..097e270955d0 100644 --- a/drivers/i2c/busses/i2c-iop3xx.h +++ b/drivers/i2c/busses/i2c-iop3xx.h @@ -97,7 +97,7 @@ #define IOP3XX_I2C_IO_SIZE 0x18 struct i2c_algo_iop3xx_data { - u32 ioaddr; + void __iomem *ioaddr; wait_queue_head_t waitq; spinlock_t lock; u32 SR_enabled, SR_received; |