Prev: [02/67] ata_piix: fix locking around SIDPR access
Next: [41/54] drm/edid: Fix the HDTV hack sync adjustment
From: Greg KH on 11 Aug 2010 20:30
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: Igor Grinberg <grinberg(a)compulab.co.il>

commit a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 upstream.

ffuart is available on cm-x300 only with pxa300.

Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao(a)gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)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
@@ -667,9 +667,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();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [02/67] ata_piix: fix locking around SIDPR access
Next: [41/54] drm/edid: Fix the HDTV hack sync adjustment