From: Igor Grinberg Date: Tue, 20 Jul 2010 07:58:52 +0000 (+0300) Subject: [ARM] pxa/cm-x300: fix ffuart registration X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6cd7eb374647b572ae9e7dbfe49871e6996e8e0;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git [ARM] pxa/cm-x300: fix ffuart registration ffuart is available on cm-x300 only with pxa300. Signed-off-by: Igor Grinberg Cc: stable Signed-off-by: Eric Miao --- diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 8d227b4e15f..c70e6c2f4e7 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();