diff options
| author | Igor Grinberg <grinberg@compulab.co.il> | 2010-07-20 10:58:52 +0300 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 14:34:58 +0800 |
| commit | a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 (patch) | |
| tree | da3a6ae17b1cd206cf48f69bbdd4bb9a4aafa4a8 | |
| parent | 2728701d1c285a36a23d2c9ffffd8cb1f953795f (diff) | |
| download | blackbird-op-linux-a6cd7eb374647b572ae9e7dbfe49871e6996e8e0.tar.gz blackbird-op-linux-a6cd7eb374647b572ae9e7dbfe49871e6996e8e0.zip | |
[ARM] pxa/cm-x300: fix ffuart registration
ffuart is available on cm-x300 only with pxa300.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: stable <stable@kernel.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -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 8d227b4e15f3..c70e6c2f4e7c 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c @@ -746,9 +746,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(); |
