diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 19:24:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-16 19:24:00 -0700 |
| commit | 8d2b6b3ae280dcf6f6c7a95623670a57cdf562ed (patch) | |
| tree | 79e0c663f37c380735a41031abaa73b4c299c9ca /arch/sh/include/asm/hw_breakpoint.h | |
| parent | 90a24a4a7e8f8b3488438276e1d15bb3762df31e (diff) | |
| parent | 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb (diff) | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt.
The bulk of this is the UAPI disintegration for SH.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Fix up more fallout from pointless ARM __iomem churn.
sh: Wire up kcmp syscall.
UAPI: (Scripted) Disintegrate arch/sh/include/asm
Diffstat (limited to 'arch/sh/include/asm/hw_breakpoint.h')
| -rw-r--r-- | arch/sh/include/asm/hw_breakpoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/hw_breakpoint.h b/arch/sh/include/asm/hw_breakpoint.h index 89890f61a7b9..ec9ad593c3da 100644 --- a/arch/sh/include/asm/hw_breakpoint.h +++ b/arch/sh/include/asm/hw_breakpoint.h @@ -1,7 +1,8 @@ #ifndef __ASM_SH_HW_BREAKPOINT_H #define __ASM_SH_HW_BREAKPOINT_H -#ifdef __KERNEL__ +#include <uapi/asm/hw_breakpoint.h> + #define __ARCH_HW_BREAKPOINT_H #include <linux/kdebug.h> @@ -66,5 +67,4 @@ extern int register_sh_ubc(struct sh_ubc *); extern struct pmu perf_ops_bp; -#endif /* __KERNEL__ */ #endif /* __ASM_SH_HW_BREAKPOINT_H */ |