From 840624d74450fbc5782a9ebd7aafd61470c0628b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 11 Sep 2008 23:33:53 -0700
Subject: [PATCH] --- yaml --- r: 113127 b: refs/heads/master c:
 17f04fbb0f7153d95ec33da81189b113cc778157 h: refs/heads/master i:   113125:
 acd34dba8110c64a87580044bca9344573770164   113123:
 55ae65051b4356c9394b78060d110c9f88df2159   113119:
 701b5a067dc51e1410e7151df60473f507387abd v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/sparc/include/asm/system_32.h | 1 +
 trunk/arch/sparc/include/asm/system_64.h | 1 +
 trunk/arch/sparc64/kernel/reboot.c       | 1 +
 trunk/kernel/sysctl.c                    | 4 +---
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fb786a530232..669086770d8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c57ed50663dc04b0b329beaec39b557c8ac5a5
+refs/heads/master: 17f04fbb0f7153d95ec33da81189b113cc778157
diff --git a/trunk/arch/sparc/include/asm/system_32.h b/trunk/arch/sparc/include/asm/system_32.h
index 4e18ef272336..8623fc48fe24 100644
--- a/trunk/arch/sparc/include/asm/system_32.h
+++ b/trunk/arch/sparc/include/asm/system_32.h
@@ -49,6 +49,7 @@ extern unsigned long empty_zero_page;
 extern void sun_do_break(void);
 extern int serial_console;
 extern int stop_a_enabled;
+extern int scons_pwroff;
 
 static inline int con_is_present(void)
 {
diff --git a/trunk/arch/sparc/include/asm/system_64.h b/trunk/arch/sparc/include/asm/system_64.h
index 98acb3b9d4a1..8759f2a1b837 100644
--- a/trunk/arch/sparc/include/asm/system_64.h
+++ b/trunk/arch/sparc/include/asm/system_64.h
@@ -117,6 +117,7 @@ do {	__asm__ __volatile__("ba,pt	%%xcc, 1f\n\t" \
 
 extern void sun_do_break(void);
 extern int stop_a_enabled;
+extern int scons_pwroff;
 
 extern void fault_in_user_windows(void);
 extern void synchronize_user_stack(void);
diff --git a/trunk/arch/sparc64/kernel/reboot.c b/trunk/arch/sparc64/kernel/reboot.c
index 11f249660630..ef89d3d69748 100644
--- a/trunk/arch/sparc64/kernel/reboot.c
+++ b/trunk/arch/sparc64/kernel/reboot.c
@@ -7,6 +7,7 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 
+#include <asm/system.h>
 #include <asm/oplib.h>
 #include <asm/prom.h>
 
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index eda6162c58f2..da5152088cc3 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -119,9 +119,7 @@ extern int sg_big_buff;
 #endif
 
 #ifdef CONFIG_SPARC
-extern char reboot_command [];
-extern int stop_a_enabled;
-extern int scons_pwroff;
+#include <asm/system.h>
 #endif
 
 #ifdef __hppa__