diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 22:22:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 22:22:46 +0100 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | Merge branch 'pxa/board' into next/boards (diff) | |
| parent | Merge branch 'imx-features-assorted' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.xz linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.zip | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -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 e9eff00cddd4..d67bcdf724d7 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -198,7 +198,7 @@ static struct platform_device rx51_charger_device = { static void __init rx51_charger_init(void) { WARN_ON(gpio_request_one(RX51_USB_TRANSCEIVER_RST_GPIO, - GPIOF_OUT_INIT_LOW, "isp1704_reset")); + GPIOF_OUT_INIT_HIGH, "isp1704_reset")); platform_device_register(&rx51_charger_device); } |