diff options
author | Adrian Hunter <adrian.hunter@nokia.com> | 2010-02-15 13:03:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 13:03:34 -0500 |
commit | 68ff04231ce9128d400f47762ae3c921be79cd49 (patch) | |
tree | ce0c321726d2df6239feeab1ddf145f5d0a549f9 /arch/arm/mach-omap2/board-omap3evm.c | |
parent | d02a900b5952597b6beebd709d92ab392fa3005a (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-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 78724d859216..45227f394758 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -367,7 +367,7 @@ static struct regulator_init_data omap3evm_vsim = { | |||
367 | .consumer_supplies = &omap3evm_vsim_supply, | 367 | .consumer_supplies = &omap3evm_vsim_supply, |
368 | }; | 368 | }; |
369 | 369 | ||
370 | static struct twl4030_hsmmc_info mmc[] = { | 370 | static struct omap2_hsmmc_info mmc[] = { |
371 | { | 371 | { |
372 | .mmc = 1, | 372 | .mmc = 1, |
373 | .wires = 4, | 373 | .wires = 4, |
@@ -407,7 +407,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev, | |||
407 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 407 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
408 | omap_mux_init_gpio(63, OMAP_PIN_INPUT); | 408 | omap_mux_init_gpio(63, OMAP_PIN_INPUT); |
409 | mmc[0].gpio_cd = gpio + 0; | 409 | mmc[0].gpio_cd = gpio + 0; |
410 | twl4030_mmc_init(mmc); | 410 | omap2_hsmmc_init(mmc); |
411 | 411 | ||
412 | /* link regulators to MMC adapters */ | 412 | /* link regulators to MMC adapters */ |
413 | omap3evm_vmmc1_supply.dev = mmc[0].dev; | 413 | omap3evm_vmmc1_supply.dev = mmc[0].dev; |