aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3pandora.c
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2010-02-15 13:03:34 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 13:03:34 -0500
commit68ff04231ce9128d400f47762ae3c921be79cd49 (patch)
treece0c321726d2df6239feeab1ddf145f5d0a549f9 /arch/arm/mach-omap2/board-omap3pandora.c
parentd02a900b5952597b6beebd709d92ab392fa3005a (diff)
omap: Rename hsmmc symbols to reflect independence from twl4030
hsmmc.[ch] no longer has any dependency on twl4030 and variable names should be renamed to reflect that. Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 63437037fc9f..9967b5d24b50 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -192,7 +192,7 @@ static struct twl4030_keypad_data pandora_kp_data = {
192 .rep = 1, 192 .rep = 1,
193}; 193};
194 194
195static struct twl4030_hsmmc_info omap3pandora_mmc[] = { 195static struct omap2_hsmmc_info omap3pandora_mmc[] = {
196 { 196 {
197 .mmc = 1, 197 .mmc = 1,
198 .wires = 4, 198 .wires = 4,
@@ -231,7 +231,7 @@ static int omap3pandora_twl_gpio_setup(struct device *dev,
231 /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */ 231 /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */
232 omap3pandora_mmc[0].gpio_cd = gpio + 0; 232 omap3pandora_mmc[0].gpio_cd = gpio + 0;
233 omap3pandora_mmc[1].gpio_cd = gpio + 1; 233 omap3pandora_mmc[1].gpio_cd = gpio + 1;
234 twl4030_mmc_init(omap3pandora_mmc); 234 omap2_hsmmc_init(omap3pandora_mmc);
235 235
236 /* link regulators to MMC adapters */ 236 /* link regulators to MMC adapters */
237 pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev; 237 pandora_vmmc1_supply.dev = omap3pandora_mmc[0].dev;