diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
| commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
| tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /arch/arm/mach-pxa/mainstone.c | |
| parent | ca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff) | |
| parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index a4eeae345e64..851ee0fc32e2 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -576,6 +576,10 @@ static void __init mainstone_init(void) | |||
| 576 | 576 | ||
| 577 | pxa2xx_mfp_config(ARRAY_AND_SIZE(mainstone_pin_config)); | 577 | pxa2xx_mfp_config(ARRAY_AND_SIZE(mainstone_pin_config)); |
| 578 | 578 | ||
| 579 | pxa_set_ffuart_info(NULL); | ||
| 580 | pxa_set_btuart_info(NULL); | ||
| 581 | pxa_set_stuart_info(NULL); | ||
| 582 | |||
| 579 | mst_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4; | 583 | mst_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4; |
| 580 | mst_flash_data[1].width = 4; | 584 | mst_flash_data[1].width = 4; |
| 581 | 585 | ||