projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap3-restart.c
diff --git
a/arch/arm/mach-omap2/omap3-restart.c
b/arch/arm/mach-omap2/omap3-restart.c
index
5de2a0c
..
103a49f
100644
(file)
--- a/
arch/arm/mach-omap2/omap3-restart.c
+++ b/
arch/arm/mach-omap2/omap3-restart.c
@@
-14,10
+14,8
@@
#include <linux/init.h>
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/reboot.h>
-#include "iomap.h"
-#include "common.h"
#include "control.h"
#include "control.h"
-#include "prm
3xxx
.h"
+#include "prm.h"
/* Global address base setup code */
/* Global address base setup code */
@@
-32,6
+30,5
@@
void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
{
omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0));
void omap3xxx_restart(enum reboot_mode mode, const char *cmd)
{
omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0));
- omap3xxx_prm_dpll3_reset(); /* never returns */
- while (1);
+ omap_prm_reset_system();
}
}