summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/system.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-03-30 10:47:19 +0400
committerIngo Molnar <mingo@kernel.org>2012-03-30 10:50:06 +0400
commit186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch)
tree9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /arch/sparc/include/asm/system.h
parent99dd5497e5be4fe4194cad181d45fd6569a930db (diff)
parent4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff)
downloadlinux-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/system.h')
-rw-r--r--arch/sparc/include/asm/system.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/system.h b/arch/sparc/include/asm/system.h
deleted file mode 100644
index 7944a7cfc996..000000000000
--- a/arch/sparc/include/asm/system.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef ___ASM_SPARC_SYSTEM_H
-#define ___ASM_SPARC_SYSTEM_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/system_64.h>
-#else
-#include <asm/system_32.h>
-#endif
-#endif