diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/mfd | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/asic3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 63fb1ff3ad10..f6f2d960cadb 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
| @@ -28,14 +28,14 @@ | |||
| 28 | static inline void asic3_write_register(struct asic3 *asic, | 28 | static inline void asic3_write_register(struct asic3 *asic, |
| 29 | unsigned int reg, u32 value) | 29 | unsigned int reg, u32 value) |
| 30 | { | 30 | { |
| 31 | iowrite16(value, (unsigned long)asic->mapping + | 31 | iowrite16(value, asic->mapping + |
| 32 | (reg >> asic->bus_shift)); | 32 | (reg >> asic->bus_shift)); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | static inline u32 asic3_read_register(struct asic3 *asic, | 35 | static inline u32 asic3_read_register(struct asic3 *asic, |
| 36 | unsigned int reg) | 36 | unsigned int reg) |
| 37 | { | 37 | { |
| 38 | return ioread16((unsigned long)asic->mapping + | 38 | return ioread16(asic->mapping + |
| 39 | (reg >> asic->bus_shift)); | 39 | (reg >> asic->bus_shift)); |
| 40 | } | 40 | } |
| 41 | 41 | ||