diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 15:14:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 15:14:20 -0400 |
commit | 9f1912c48ce829d24789e3e5d499de0d44d3306a (patch) | |
tree | 056ca04727d478f74b20d8af5729e0776a942cca /arch/arm/mach-omap2 | |
parent | 4c171acc20794af16a27da25e11ec4e9cad5d9fa (diff) | |
parent | 099691081df40d8863cb2fb01ee64039633892dd (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
regulator: Fix 88pm8607.c printk format warning
input: Add support for Qualcomm PMIC8XXX power key
input: Add Qualcomm pm8xxx keypad controller driver
mfd: Add omap-usbhs runtime PM support
mfd: Fix ASIC3 SD Host Controller Configuration size
mfd: Fix omap_usbhs_alloc_children error handling
mfd: Fix omap usbhs crash when rmmoding ehci or ohci
mfd: Add ASIC3 LED support
leds: Add ASIC3 LED support
mfd: Update twl4030-code maintainer e-mail address
mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
mfd: Provide ab8500-core enumerators for chip cuts
mfd: Check twl4030-power remove script error condition after i2cwrite
mfd: Fix twl6030 irq definitions
mfd: Add phoenix lite (twl6025) support to twl6030
mfd: Avoid to use constraint name in 88pm860x regulator driver
mfd: Remove checking on max8925 regulator[0]
mfd: Remove unused parameter from 88pm860x API
mfd: Avoid to allocate 88pm860x static platform data
...
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 2e509f9149e2..2b00f72e8e36 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -729,7 +729,7 @@ static struct twl4030_resconfig twl4030_rconfig[] __initdata = { | |||
729 | { .resource = RES_RESET, .devgroup = -1, | 729 | { .resource = RES_RESET, .devgroup = -1, |
730 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 | 730 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 |
731 | }, | 731 | }, |
732 | { .resource = RES_Main_Ref, .devgroup = -1, | 732 | { .resource = RES_MAIN_REF, .devgroup = -1, |
733 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 | 733 | .type = 1, .type2 = -1, .remap_off = -1, .remap_sleep = -1 |
734 | }, | 734 | }, |
735 | { 0, 0}, | 735 | { 0, 0}, |