git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-sx1.c
diff --git
a/arch/arm/mach-omap1/board-sx1.c
b/arch/arm/mach-omap1/board-sx1.c
index
995566b
..
2eb148b
100644
(file)
--- a/
arch/arm/mach-omap1/board-sx1.c
+++ b/
arch/arm/mach-omap1/board-sx1.c
@@
-392,7
+392,7
@@
static void __init omap_sx1_init(void)
omap_board_config_size = ARRAY_SIZE(sx1_config);
omap_serial_init();
omap_register_i2c_bus(1, 100, NULL, 0);
- omap_usb_init(&sx1_usb_config);
+ omap
1
_usb_init(&sx1_usb_config);
sx1_mmc_init();
/* turn on USB power */