diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-13 13:32:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 13:32:07 -0700 |
| commit | 3423166fdbc2444bf3a4a27af1d7508364a17be7 (patch) | |
| tree | 0a42bd5fbe6bcca79802bf1ec5af6acf12aadd82 /arch/sparc/kernel/reboot.c | |
| parent | e9b57cca3dbdc7a0b90514af8bf613baf97105a5 (diff) | |
| parent | 7d93101fc71ec47c7cc66ac99f76ef795c5207aa (diff) | |
| download | talos-op-linux-3423166fdbc2444bf3a4a27af1d7508364a17be7.tar.gz talos-op-linux-3423166fdbc2444bf3a4a27af1d7508364a17be7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'arch/sparc/kernel/reboot.c')
| -rw-r--r-- | arch/sparc/kernel/reboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/reboot.c b/arch/sparc/kernel/reboot.c index 006a42dd2007..eba7d918162a 100644 --- 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() |
