diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:33:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:33:25 -0700 |
| commit | c32f1a34ff1097110469a240ea4539dc9c101e96 (patch) | |
| tree | eda863205e83afe54cbedcf15cdac416cdec2cf5 /include/asm-sparc64/rtc.h | |
| parent | 4f31f3080943c7e3541f07df326f06d598a067d0 (diff) | |
| parent | 04d91cb8163f7f946e348b2362a6e5dfa5f06b13 (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 'include/asm-sparc64/rtc.h')
| -rw-r--r-- | include/asm-sparc64/rtc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/rtc.h b/include/asm-sparc64/rtc.h deleted file mode 100644 index e49a9685aea..00000000000 --- a/include/asm-sparc64/rtc.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/rtc.h> |