diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2007-05-10 06:15:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 12:26:52 -0400 |
| commit | 0cfe61e1a72b345073bb7900a7887da8541abc7a (patch) | |
| tree | 934fd1e24f7f20c16b171136cf5e4cf34e436d03 /drivers/i2c | |
| parent | c4a7f5eb5f6a02dcc3a35e47c37c3d221ebc1cc2 (diff) | |
arm: fix i2c-pxa build
From commit 7d054817b780e664bed6701b2aa637718e1905b7:
> According to the PXA27x developer's manual, we shall do so.
We shall also at least compile test our changes.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 873544ab598e..8a0a99b93641 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
| @@ -548,7 +548,7 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c) | |||
| 548 | */ | 548 | */ |
| 549 | icr = readl(_ICR(i2c)); | 549 | icr = readl(_ICR(i2c)); |
| 550 | icr &= ~(ICR_STOP | ICR_ACKNAK); | 550 | icr &= ~(ICR_STOP | ICR_ACKNAK); |
| 551 | writel(icr, _IRC(i2c)); | 551 | writel(icr, _ICR(i2c)); |
| 552 | } | 552 | } |
| 553 | 553 | ||
| 554 | /* | 554 | /* |