projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d58cc92
3da434a
)
Merge branch 'devel-boards' into omap-for-linus
author
Tony Lindgren
<tony@atomide.com>
Mon, 27 Sep 2010 17:19:44 +0000
(10:19 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 27 Sep 2010 17:19:44 +0000
(10:19 -0700)
1
2
arch/arm/mach-omap2/board-4430sdp.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-omap3beagle.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-omap2/board-omap4panda.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/board-4430sdp.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc
arch/arm/mach-omap2/board-omap4panda.c
index 0bb2353b64a4bf138d59608bdad9b111b336087b,22a8fd30f9ffddec29afa1727ef7987c721260a0..aa8296e7e9d45b078b0191d39565a79859cdde27
---
1
/
arch/arm/mach-omap2/board-omap4panda.c
---
2
/
arch/arm/mach-omap2/board-omap4panda.c
+++ b/
arch/arm/mach-omap2/board-omap4panda.c
@@@
-274,7
-305,10
+305,8
@@@
static int __init omap4_panda_i2c_init(
}
static void __init omap4_panda_init(void)
{
- int status;
-
omap4_panda_i2c_init();
+ platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
omap_serial_init();
omap4_twl6030_hsmmc_init(mmc);
/* OMAP4 Panda uses internal transceiver so register nop transceiver */