From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 Sep 2005 11:56:38 +0000 (+0300)
Subject: ARM: OMAP: Renamed OMAP2_MUX_CFG to MUX_CFG_24XX
X-Git-Tag: v2.6.15-omap2~215
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e6c3796634e2adc4241d67d2ec5f40c6214b77d2;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Renamed OMAP2_MUX_CFG to MUX_CFG_24XX

OMAP2_MUX_CFG to MUX_CFG_24XX
---

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 31828840594..ef450020a01 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -40,11 +40,11 @@ struct pin_config __initdata_or_module omap24xx_pins[] = {
  */
 
 /* 24xx I2C */
-OMAP2_MUX_CFG("M19_24XX_I2C1_SCL",    0x111,    0,    0,    0,    1)
-OMAP2_MUX_CFG("L15_24XX_I2C1_SDA",    0x112,    0,    0,    0,    1)
-OMAP2_MUX_CFG("J15_24XX_I2C2_SCL",    0x113,    0,    0,    0,    1)
-OMAP2_MUX_CFG("H19_24XX_I2C2_SDA",    0x114,    0,    0,    0,    1)
-OMAP2_MUX_CFG("W19_24XX_SYS_NIRQ",    0x12c,    0,    1,    1,    1)
+MUX_CFG_24XX("M19_24XX_I2C1_SCL",    0x111,    0,    0,    0,    1)
+MUX_CFG_24XX("L15_24XX_I2C1_SDA",    0x112,    0,    0,    0,    1)
+MUX_CFG_24XX("J15_24XX_I2C2_SCL",    0x113,    0,    0,    0,    1)
+MUX_CFG_24XX("H19_24XX_I2C2_SDA",    0x114,    0,    0,    0,    1)
+MUX_CFG_24XX("W19_24XX_SYS_NIRQ",    0x12c,    0,    1,    1,    1)
 };
 
 int __init omap2_mux_init(void)
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 8157c9c8cdf..1d61631b4a3 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -122,7 +122,7 @@
 	PU_PD_REG(pu_pd_reg, pu_pd_status)		\
 },
 
-#define OMAP2_MUX_CFG(desc, reg_offset, mode,			\
+#define MUX_CFG_24XX(desc, reg_offset, mode,			\
 				pull_en, pull_mode, dbg)	\
 {								\
 	.name		= desc,					\