diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 17:06:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 17:06:11 -0500 |
| commit | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (patch) | |
| tree | 5f55b84771d1b73bcaec534fdbbc1ec6dd21598d /arch/arm/mach-omap2/board-devkit8000.c | |
| parent | 477d4e4fbedafb1cc636124f2de06defceb399b0 (diff) | |
| parent | dfcccd3aaba15e4e8ffae65fb2a757b3e49470de (diff) | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
arm: omap1: devices: need to return with a value
OMAP1: camera.h: add missing include
omap: dma: Add read-back to DMA interrupt handler to avoid spuriousinterrupts
OMAP2: Devkit8000: Fix mmc regulator failure
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 | ||