diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 16:19:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-10 16:19:07 -0700 |
| commit | 0cdf5a464070c8a2980a27113c47fb8e71babb9c (patch) | |
| tree | c2556657873d9c4d50a107727dbf0b30ff1be6ec /arch/hexagon/include | |
| parent | 65c61bc5dbbcfa1ff38e58aa834cb9a88e84a886 (diff) | |
| parent | 02cc2ccfe771677db3cd40a71837e1467ebc839a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull hexagon updates from Richard Kuo:
"Just two fixes -- one for a uapi header and one for a timer interface"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
Revert "Hexagon: fix signal.c compile error"
hexagon/time: Migrate to new 'set-state' interface
Diffstat (limited to 'arch/hexagon/include')
| -rw-r--r-- | arch/hexagon/include/uapi/asm/signal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/hexagon/include/uapi/asm/signal.h b/arch/hexagon/include/uapi/asm/signal.h index 98106e55ad4f..24b998888916 100644 --- a/arch/hexagon/include/uapi/asm/signal.h +++ b/arch/hexagon/include/uapi/asm/signal.h @@ -19,8 +19,6 @@ #ifndef _ASM_SIGNAL_H #define _ASM_SIGNAL_H -#include <uapi/asm/registers.h> - extern unsigned long __rt_sigtramp_template[2]; void do_signal(struct pt_regs *regs); |