diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
| commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
| tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /arch/arm/mach-omap2/board-devkit8000.c | |
| parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 067f4379c87f..53ac762518bd 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -242,9 +242,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, | |||
| 242 | mmc[0].gpio_cd = gpio + 0; | 242 | mmc[0].gpio_cd = gpio + 0; |
| 243 | omap2_hsmmc_init(mmc); | 243 | omap2_hsmmc_init(mmc); |
| 244 | 244 | ||
| 245 | /* link regulators to MMC adapters */ | ||
| 246 | devkit8000_vmmc1_supply.dev = mmc[0].dev; | ||
| 247 | |||
| 248 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ | 245 | /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ |
| 249 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; | 246 | gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; |
| 250 | 247 | ||