aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm/floppy.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 /arch/sparc/include/asm/floppy.h
parent4f31f3080943c7e3541f07df326f06d598a067d0 (diff)
parent04d91cb8163f7f946e348b2362a6e5dfa5f06b13 (diff)
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 'arch/sparc/include/asm/floppy.h')
-rw-r--r--arch/sparc/include/asm/floppy.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/floppy.h b/arch/sparc/include/asm/floppy.h
new file mode 100644
index 00000000000..faebd335b60
--- /dev/null
+++ b/arch/sparc/include/asm/floppy.h
@@ -0,0 +1,8 @@
+#ifndef ___ASM_SPARC_FLOPPY_H
+#define ___ASM_SPARC_FLOPPY_H
+#if defined(__sparc__) && defined(__arch64__)
+#include <asm/floppy_64.h>
+#else
+#include <asm/floppy_32.h>
+#endif
+#endif