diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-12 15:26:47 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:27:01 -0500 |
commit | 088ef950dc0dd58d2f339e1616c9092fea923f06 (patch) | |
tree | 4901dd1855d101f2d4c84c1d297edb4e9404ffcd /arch/arm/plat-omap/i2c.c | |
parent | d10f2b6e745f1232ff6517b335faf3bfd7005bec (diff) |
omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2
Convert ARCH_OMAP24XX to ARCH_OMAP2
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/i2c.c')
-rw-r--r-- | arch/arm/plat-omap/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 33fff4ef382d..7773bceca442 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c | |||
@@ -50,7 +50,7 @@ static const char name[] = "i2c_omap"; | |||
50 | 50 | ||
51 | static struct resource i2c_resources[][2] = { | 51 | static struct resource i2c_resources[][2] = { |
52 | { I2C_RESOURCE_BUILDER(0, 0) }, | 52 | { I2C_RESOURCE_BUILDER(0, 0) }, |
53 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 53 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) |
54 | { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) }, | 54 | { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) }, |
55 | #endif | 55 | #endif |
56 | #if defined(CONFIG_ARCH_OMAP34XX) | 56 | #if defined(CONFIG_ARCH_OMAP34XX) |
@@ -72,7 +72,7 @@ static struct resource i2c_resources[][2] = { | |||
72 | static u32 i2c_rate[ARRAY_SIZE(i2c_resources)]; | 72 | static u32 i2c_rate[ARRAY_SIZE(i2c_resources)]; |
73 | static struct platform_device omap_i2c_devices[] = { | 73 | static struct platform_device omap_i2c_devices[] = { |
74 | I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]), | 74 | I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]), |
75 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 75 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) |
76 | I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]), | 76 | I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]), |
77 | #endif | 77 | #endif |
78 | #if defined(CONFIG_ARCH_OMAP34XX) | 78 | #if defined(CONFIG_ARCH_OMAP34XX) |