diff options
| author |   David Howells <dhowells@redhat.com> | 2012-10-09 09:47:37 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-09 09:47:37 +0100 |
| commit | 0a9426df1858f71ac84eb7eef500b4247de5e3bb (patch) | |
| tree | 82983766b53c18f5da8602f16ed0b67ae2a957fb /arch/sh/include/asm/setup.h | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | linux-dev-0a9426df1858f71ac84eb7eef500b4247de5e3bb.tar.xz linux-dev-0a9426df1858f71ac84eb7eef500b4247de5e3bb.zip | |
UAPI: (Scripted) Disintegrate arch/sh/include/asm
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
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 */ |