git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
tavorevb.c
diff --git
a/arch/arm/mach-pxa/tavorevb.c
b/arch/arm/mach-pxa/tavorevb.c
index b75353a2ec75ad5398d7f9e5723731952cf22d86..f02dcb5b4e97e53e14212e0b61892abc8f3f3046 100644
(file)
--- a/
arch/arm/mach-pxa/tavorevb.c
+++ b/
arch/arm/mach-pxa/tavorevb.c
@@
-477,6
+477,10
@@
static void __init tavorevb_init(void)
/* initialize MFP configurations */
pxa3xx_mfp_config(ARRAY_AND_SIZE(tavorevb_mfp_cfg));
+ pxa_set_ffuart_info(NULL);
+ pxa_set_btuart_info(NULL);
+ pxa_set_stuart_info(NULL);
+
platform_device_register(&smc91x_device);
tavorevb_init_lcd();