From c312af1855afdb322e422f4ae604808df14f514d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 4 Sep 2012 17:43:29 -0700 Subject: [PATCH] --- yaml --- r: 326507 b: refs/heads/master c: 936e0f2fd64efbb28444c916814b6232dddac03b h: refs/heads/master i: 326505: 6119eb285fa754e9d0982acd8014151887ad5d54 326503: aecf6ea458aa175ff1d7f4cfb73baa3317cf3581 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/i2c.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ec3d93a89501..597d8bce350f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee073176808bba3039dabeaf6553ecdb9d7f765 +refs/heads/master: 936e0f2fd64efbb28444c916814b6232dddac03b diff --git a/trunk/arch/arm/plat-omap/i2c.c b/trunk/arch/arm/plat-omap/i2c.c index db071bc71c4d..40bc06a7ac43 100644 --- a/trunk/arch/arm/plat-omap/i2c.c +++ b/trunk/arch/arm/plat-omap/i2c.c @@ -39,6 +39,7 @@ #define OMAP_I2C_SIZE 0x3f #define OMAP1_I2C_BASE 0xfffb3800 +#define OMAP1_INT_I2C (32 + 4) static const char name[] = "omap_i2c"; @@ -105,7 +106,7 @@ static inline int omap1_i2c_add_bus(int bus_id) res = pdev->resource; res[0].start = OMAP1_I2C_BASE; res[0].end = res[0].start + OMAP_I2C_SIZE; - res[1].start = INT_I2C; + res[1].start = OMAP1_INT_I2C; pdata = &i2c_pdata[bus_id - 1]; /* all OMAP1 have IP version 1 register set */