diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/mach-pxa/poodle.c | |
| parent | e28edb723e64200554194da17617ee6e82de6690 (diff) | |
| parent | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
| -rw-r--r-- | arch/arm/mach-pxa/poodle.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index a186994f77fb..e5eeb3a62d01 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
| @@ -449,6 +449,10 @@ static void __init poodle_init(void) | |||
| 449 | 449 | ||
| 450 | pxa2xx_mfp_config(ARRAY_AND_SIZE(poodle_pin_config)); | 450 | pxa2xx_mfp_config(ARRAY_AND_SIZE(poodle_pin_config)); |
| 451 | 451 | ||
| 452 | pxa_set_ffuart_info(NULL); | ||
| 453 | pxa_set_btuart_info(NULL); | ||
| 454 | pxa_set_stuart_info(NULL); | ||
| 455 | |||
| 452 | platform_scoop_config = &poodle_pcmcia_config; | 456 | platform_scoop_config = &poodle_pcmcia_config; |
| 453 | 457 | ||
| 454 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | 458 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |