aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/setup.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 08:33:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 08:33:25 -0700
commitc32f1a34ff1097110469a240ea4539dc9c101e96 (patch)
treeeda863205e83afe54cbedcf15cdac416cdec2cf5 /include/asm-sparc64/setup.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentsparc: Set CONFIG_HAVE_ARCH_TRACEHOOK (diff)
downloadlinux-dev-c32f1a34ff1097110469a240ea4539dc9c101e96.tar.xz
linux-dev-c32f1a34ff1097110469a240ea4539dc9c101e96.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Set CONFIG_HAVE_ARCH_TRACEHOOK sparc: Add task_pt_regs(). sparc: Add call to tracehook_signal_handler(). sparc: Create and use TIF_NOTIFY_RESUME. sparc: Use tracehook routines in syscall_trace(). sparc64: tracehook: CONFIG_HAVE_ARCH_TRACEHOOK sparc: Add user_stack_pointer(). sparc64: tracehook_signal_handler sparc64: tracehook: TIF_NOTIFY_RESUME sparc: Add asm/syscall.h sparc64: tracehook syscall sparc: enable headers_export again sparc, sparc64: use arch/sparc/include
Diffstat (limited to 'include/asm-sparc64/setup.h')
-rw-r--r--include/asm-sparc64/setup.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/setup.h b/include/asm-sparc64/setup.h
deleted file mode 100644
index 7143d06b2c55..000000000000
--- a/include/asm-sparc64/setup.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/setup.h>