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 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
prcm.c
diff --git
a/arch/arm/mach-omap2/prcm.c
b/arch/arm/mach-omap2/prcm.c
index
6be1438
..
2e40a5c
100644
(file)
--- a/
arch/arm/mach-omap2/prcm.c
+++ b/
arch/arm/mach-omap2/prcm.c
@@
-70,7
+70,7
@@
static void omap_prcm_arch_reset(char mode, const char *cmd)
prcm_offs = OMAP3430_GR_MOD;
omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0));
} else if (cpu_is_omap44xx()) {
- omap4_prm_global_warm_sw_reset(); /* never returns */
+ omap4_prm
inst
_global_warm_sw_reset(); /* never returns */
} else {
WARN_ON(1);
}