diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-pxa/tosa.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index e81a52673d4..c854c168a45 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -825,6 +825,11 @@ static void __init tosa_init(void) | |||
| 825 | int dummy; | 825 | int dummy; |
| 826 | 826 | ||
| 827 | pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config)); | 827 | pxa2xx_mfp_config(ARRAY_AND_SIZE(tosa_pin_config)); |
| 828 | |||
| 829 | pxa_set_ffuart_info(NULL); | ||
| 830 | pxa_set_btuart_info(NULL); | ||
| 831 | pxa_set_stuart_info(NULL); | ||
| 832 | |||
| 828 | gpio_set_wake(MFP_PIN_GPIO1, 1); | 833 | gpio_set_wake(MFP_PIN_GPIO1, 1); |
| 829 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ | 834 | /* We can't pass to gpio-keys since it will drop the Reset altfunc */ |
| 830 | 835 | ||