diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 13:33:49 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 13:37:46 +0000 |
| commit | 0fa2fd9a0d4f1305a54a396d44975894e90eed7b (patch) | |
| tree | 56045663b63cb29c2515e0c87519ff10398c4ab0 /arch | |
| parent | 46ebfbc3745597067494186a0e7031add22f3134 (diff) | |
| parent | 476171ce7850b28280db6a2d0c0e4d3ff26c8117 (diff) | |
| download | linux-3.10-0fa2fd9a0d4f1305a54a396d44975894e90eed7b.tar.gz linux-3.10-0fa2fd9a0d4f1305a54a396d44975894e90eed7b.tar.bz2 linux-3.10-0fa2fd9a0d4f1305a54a396d44975894e90eed7b.zip | |
Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git into gpio/next
Device driver features, cleanups and bug fixes.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 233629edf7e..4f35b333de4 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -927,8 +927,6 @@ static void tosa_restart(char mode, const char *cmd) static void __init tosa_init(void) { - int dummy; - pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config)); pxa_set_ffuart_info(NULL); @@ -947,10 +945,6 @@ static void __init tosa_init(void) /* enable batt_fault */ PMCR = 0x01; - dummy = gpiochip_reserve(TOSA_SCOOP_GPIO_BASE, 12); - dummy = gpiochip_reserve(TOSA_SCOOP_JC_GPIO_BASE, 12); - dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16); - pxa_set_mci_info(&tosa_mci_platform_data); pxa_set_ficp_info(&tosa_ficp_platform_data); pxa_set_i2c_info(NULL); |