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-omap3touchbook.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-omap3touchbook.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 1e3f53c605ca..8252ba49a664 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
@@ -122,7 +122,7 @@ static struct platform_device omap3touchbook_nand_device = { | |||
122 | 122 | ||
123 | #include "sdram-micron-mt46h32m32lf-6.h" | 123 | #include "sdram-micron-mt46h32m32lf-6.h" |
124 | 124 | ||
125 | static struct twl4030_hsmmc_info mmc[] = { | 125 | static struct omap2_hsmmc_info mmc[] = { |
126 | { | 126 | { |
127 | .mmc = 1, | 127 | .mmc = 1, |
128 | .wires = 8, | 128 | .wires = 8, |
@@ -161,7 +161,7 @@ static int touchbook_twl_gpio_setup(struct device *dev, | |||
161 | } | 161 | } |
162 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ | 162 | /* gpio + 0 is "mmc0_cd" (input/IRQ) */ |
163 | mmc[0].gpio_cd = gpio + 0; | 163 | mmc[0].gpio_cd = gpio + 0; |
164 | twl4030_mmc_init(mmc); | 164 | omap2_hsmmc_init(mmc); |
165 | 165 | ||
166 | /* link regulators to MMC adapters */ | 166 | /* link regulators to MMC adapters */ |
167 | touchbook_vmmc1_supply.dev = mmc[0].dev; | 167 | touchbook_vmmc1_supply.dev = mmc[0].dev; |