projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-merged
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
reboot.c
diff --git
a/arch/sparc/kernel/reboot.c
b/arch/sparc/kernel/reboot.c
index
006a42d
..
eba7d91
100644
(file)
--- a/
arch/sparc/kernel/reboot.c
+++ b/
arch/sparc/kernel/reboot.c
@@
-7,9
+7,9
@@
#include <linux/export.h>
#include <linux/pm.h>
-#include <asm/system.h>
#include <asm/oplib.h>
#include <asm/prom.h>
+#include <asm/setup.h>
/* sysctl - toggle power-off restriction for serial console
* systems in machine_power_off()