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/setup.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/setup.h')
| -rw-r--r-- | arch/sh/include/asm/setup.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h index 465a22df8fd..99238108e7a 100644 --- a/arch/sh/include/asm/setup.h +++ b/arch/sh/include/asm/setup.h @@ -1,9 +1,8 @@ #ifndef _SH_SETUP_H #define _SH_SETUP_H -#include <asm-generic/setup.h> +#include <uapi/asm/setup.h> -#ifdef __KERNEL__ /* * This is set up by the setup-routine at boot-time */ @@ -22,6 +21,4 @@ void sh_mv_setup(void); void check_for_initrd(void); void per_cpu_trap_init(void); -#endif /* __KERNEL__ */ - #endif /* _SH_SETUP_H */ |