diff options
| author | Igor Grinberg <grinberg@compulab.co.il> | 2010-07-20 10:58:52 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-13 13:30:54 -0700 |
| commit | c53f89ac7b1b89a7132e59a1a8dc548eaeb10556 (patch) | |
| tree | 87afd3b8b4572484c6ca68da940fcbe84f1ad389 /arch/arm/mach-pxa/cm-x300.c | |
| parent | d774a312e59179db06d61d916f096fa241545e59 (diff) | |
pxa/cm-x300: fix ffuart registration
commit a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 upstream.
ffuart is available on cm-x300 only with pxa300.
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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(); |