diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 13:47:38 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 13:47:38 +0900 |
| commit | 850fbcffe252368a87b3209a4b8edfbd18044c3f (patch) | |
| tree | 5f9c582018228f2c574cbaf3363478535f2715a2 /arch/sh/include/asm/setup.h | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | 0a9426df1858f71ac84eb7eef500b4247de5e3bb (diff) | |
| download | blackbird-op-linux-850fbcffe252368a87b3209a4b8edfbd18044c3f.tar.gz blackbird-op-linux-850fbcffe252368a87b3209a4b8edfbd18044c3f.zip | |
Merge tag 'disintegrate-sh-20121009' of git://git.infradead.org/users/dhowells/linux-headers into sh-latest
UAPI Disintegration 2012-10-09
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 465a22df8fd0..99238108e7a5 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 */ |
