diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-01-23 22:58:13 +0100 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-01-23 22:58:13 +0100 |
| commit | 6702493ec2b7b85ad71986f582a3458422c98231 (patch) | |
| tree | 4cc03c452f6357a4a694165d28cdd5b44d9aefb2 /arch/arm/mach-pxa/cm-x300.c | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
| download | imx53-linaro-based-on-adeneo.tar.gz | |
Import stock 2.6.35.3linaro-based-on-adeneo
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index fdda6be6c39..d717b49f017 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -745,9 +745,10 @@ static void __init cm_x300_init(void) { cm_x300_init_mfp(); - pxa_set_ffuart_info(NULL); pxa_set_btuart_info(NULL); pxa_set_stuart_info(NULL); + if (cpu_is_pxa300()) + pxa_set_ffuart_info(NULL); cm_x300_init_da9030(); cm_x300_init_dm9000(); |