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 'devel-map-io' into omap-for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-htcherald.c
diff --git
a/arch/arm/mach-omap1/board-htcherald.c
b/arch/arm/mach-omap1/board-htcherald.c
index
d70a4f0
..
311899f
100644
(file)
--- a/
arch/arm/mach-omap1/board-htcherald.c
+++ b/
arch/arm/mach-omap1/board-htcherald.c
@@
-287,7
+287,7
@@
static void __init htcherald_init(void)
htcherald_disable_watchdog();
htcherald_usb_enable();
- omap_usb_init(&htcherald_usb_config);
+ omap
1
_usb_init(&htcherald_usb_config);
}
static void __init htcherald_init_irq(void)