aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/i2c.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 12:26:47 -0800
committerTony Lindgren <tony@atomide.com>2010-02-15 09:27:01 -0800
commit088ef950dc0dd58d2f339e1616c9092fea923f06 (patch)
tree4901dd1855d101f2d4c84c1d297edb4e9404ffcd /arch/arm/plat-omap/i2c.c
parentd10f2b6e745f1232ff6517b335faf3bfd7005bec (diff)
downloadkernel_samsung_smdk4412-088ef950dc0dd58d2f339e1616c9092fea923f06.zip
kernel_samsung_smdk4412-088ef950dc0dd58d2f339e1616c9092fea923f06.tar.gz
kernel_samsung_smdk4412-088ef950dc0dd58d2f339e1616c9092fea923f06.tar.bz2
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 33fff4e..7773bce 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";
static struct resource i2c_resources[][2] = {
{ I2C_RESOURCE_BUILDER(0, 0) },
-#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
{ I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },
#endif
#if defined(CONFIG_ARCH_OMAP34XX)
@@ -72,7 +72,7 @@ static struct resource i2c_resources[][2] = {
static u32 i2c_rate[ARRAY_SIZE(i2c_resources)];
static struct platform_device omap_i2c_devices[] = {
I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]),
-#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]),
#endif
#if defined(CONFIG_ARCH_OMAP34XX)