diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 11:31:14 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 11:31:14 +0000 |
| commit | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (patch) | |
| tree | a5302057b2d2bdfb2072cb2ff0df9e1c0990345c /drivers/i2c | |
| parent | Merge NetSilicon NS93xx tree (diff) | |
| parent | [ARM] 4184/1: iop: cp6 access handler (undef_hook) (diff) | |
| download | linux-dev-3b0eb4a195a124567cd0dd6f700f8388def542c6.tar.xz linux-dev-3b0eb4a195a124567cd0dd6f700f8388def542c6.zip | |
Merge the easy part of the IOP branch
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index d108ab4974cc..b70a7f7daacc 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -84,7 +84,7 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap) * Every time unit enable is asserted, GPOD needs to be cleared * on IOP3XX to avoid data corruption on the bus. */ -#ifdef CONFIG_PLAT_IOP +#if defined(CONFIG_ARCH_IOP32X) || defined(CONFIG_ARCH_IOP33X) if (iop3xx_adap->id == 0) { gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW); gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW); |