commit | 3f6240f3e4e2608caf1a70d614ada658cbcbe7be | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Tue Jun 05 07:06:01 2012 -0700 |
committer | QuIC Gerrit Code Review <code-review@localhost> | Tue Jun 05 07:06:01 2012 -0700 |
tree | c93c8fb2e9ef9dddd2c943d7d91f8407b57bd8f0 | |
parent | fd3e8a76b97087cf96842276cf946259efe5e6de [diff] | |
parent | 52015a54b1a717e150088e4d64b2c92dea18c4b2 [diff] |
Merge "board-8064-gpio: Update FUNC for EPM SPI CS" into msm-3.0
diff --git a/arch/arm/mach-msm/board-8064-gpiomux.c b/arch/arm/mach-msm/board-8064-gpiomux.c index 8008cff..b018a20 100644 --- a/arch/arm/mach-msm/board-8064-gpiomux.c +++ b/arch/arm/mach-msm/board-8064-gpiomux.c
@@ -55,7 +55,7 @@ /* Chip selects for EPM SPI clients */ static struct gpiomux_setting gpio_epm_spi_cs_config = { - .func = GPIOMUX_FUNC_3, + .func = GPIOMUX_FUNC_6, .drv = GPIOMUX_DRV_12MA, .pull = GPIOMUX_PULL_UP, };