aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-zoom-peripherals.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-zoom-peripherals.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-zoom-peripherals.c')
-rwxr-xr-xarch/arm/mach-omap2/board-zoom-peripherals.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 52940a426d9d..4278d5e14bb8 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -150,7 +150,7 @@ static struct regulator_init_data zoom_vsim = {
150 .consumer_supplies = &zoom_vsim_supply, 150 .consumer_supplies = &zoom_vsim_supply,
151}; 151};
152 152
153static struct twl4030_hsmmc_info mmc[] __initdata = { 153static struct omap2_hsmmc_info mmc[] __initdata = {
154 { 154 {
155 .name = "external", 155 .name = "external",
156 .mmc = 1, 156 .mmc = 1,
@@ -175,7 +175,7 @@ static int zoom_twl_gpio_setup(struct device *dev,
175{ 175{
176 /* gpio + 0 is "mmc0_cd" (input/IRQ) */ 176 /* gpio + 0 is "mmc0_cd" (input/IRQ) */
177 mmc[0].gpio_cd = gpio + 0; 177 mmc[0].gpio_cd = gpio + 0;
178 twl4030_mmc_init(mmc); 178 omap2_hsmmc_init(mmc);
179 179
180 /* link regulators to MMC adapters ... we "know" the 180 /* link regulators to MMC adapters ... we "know" the
181 * regulators will be set up only *after* we return. 181 * regulators will be set up only *after* we return.