Messages in this thread Patch in this message |  | | Date | Wed, 11 Aug 2010 17:05:56 -0700 | From | Greg KH <> | Subject | [41/67] [ARM] pxa/cm-x300: fix ffuart registration |
| |
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Igor Grinberg <grinberg@compulab.co.il>
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>
--- arch/arm/mach-pxa/cm-x300.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- 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();
|  |