projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5567fa1
ca4caa4
)
Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Sep 2009 17:17:39 +0000
(10:17 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Sep 2009 17:17:39 +0000
(10:17 -0700)
1
2
arch/arm/mach-omap2/board-3430sdp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/powerdomain.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/serial.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/board-3430sdp.c
Simple merge
diff --cc
arch/arm/mach-omap2/powerdomain.c
Simple merge
diff --cc
arch/arm/mach-omap2/serial.c
index
0f50810
,
ca28424
..
021130d
---
1
/
arch/arm/mach-omap2/serial.c
---
2
/
arch/arm/mach-omap2/serial.c
+++ b/
arch/arm/mach-omap2/serial.c
@@@
-565,20
-550,9
+565,20
@@@
static struct omap_uart_state omap_uart
},
},
},
+#ifdef CONFIG_ARCH_OMAP4
+ {
+ .pdev = {
+ .name = "serial8250",
+ .id = 3
+ .dev = {
+ .platform_data = serial_platform_data3,
+ },
+ },
+ },
+#endif
};
- void __init omap_serial_init(void)
+ void __init omap_serial_
early_
init(void)
{
int i;
char name[16];