diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:24:30 +0100 |
| commit | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (patch) | |
| tree | 3c644d508b67f9de2845b1e84f249f150e695c23 /drivers/i2c/busses/i2c-highlander.c | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
| parent | 5279585ff2bedc8180da5bdf8aa3ff1736466de2 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/i2c/busses/i2c-highlander.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-highlander.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index f4d22ae9d29..e5a8dae4a28 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c @@ -92,7 +92,7 @@ static void highlander_i2c_setup(struct highlander_i2c_dev *dev) static void smbus_write_data(u8 *src, u16 *dst, int len) { for (; len > 1; len -= 2) { - *dst++ = be16_to_cpup((u16 *)src); + *dst++ = be16_to_cpup((__be16 *)src); src += 2; } @@ -103,7 +103,7 @@ static void smbus_write_data(u8 *src, u16 *dst, int len) static void smbus_read_data(u16 *src, u8 *dst, int len) { for (; len > 1; len -= 2) { - *(u16 *)dst = cpu_to_be16p(src++); + *(__be16 *)dst = cpu_to_be16p(src++); dst += 2; } |