Merge branch 'akpm' (Andrew's patch-bomb)
[~shefty/rdma-dev.git] / kernel / sysctl.c
index dbd70bdc1765349db4e3e8163abaaec341b8e12c..52b3a06a02f8406c4f78eb06cfaad89f51910a21 100644 (file)
@@ -69,6 +69,9 @@
 #include <asm/stacktrace.h>
 #include <asm/io.h>
 #endif
+#ifdef CONFIG_SPARC
+#include <asm/setup.h>
+#endif
 #ifdef CONFIG_BSD_PROCESS_ACCT
 #include <linux/acct.h>
 #endif
@@ -143,7 +146,6 @@ static const int cap_last_cap = CAP_LAST_CAP;
 #include <linux/inotify.h>
 #endif
 #ifdef CONFIG_SPARC
-#include <asm/system.h>
 #endif
 
 #ifdef CONFIG_SPARC64