OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d774a31
)
pxa/cm-x300: fix ffuart registration
author
Igor Grinberg
<grinberg@compulab.co.il>
Tue, 20 Jul 2010 07:58:52 +0000
(10:58 +0300)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 13 Aug 2010 20:30:54 +0000
(13:30 -0700)
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
patch
|
blob
|
history
diff --git
a/arch/arm/mach-pxa/cm-x300.c
b/arch/arm/mach-pxa/cm-x300.c
index
fdda6be
..
d717b49
100644
(file)
--- 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();