diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-09 09:47:14 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-09 09:47:14 +0100 |
| commit | 61730c538f8281efa7ac12596da9f3f9a31b9272 (patch) | |
| tree | cda3febfc512cd4dd667601427b42b612d7ea6d7 /arch/mips/include/asm/types.h | |
| parent | 9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff) | |
UAPI: (Scripted) Disintegrate arch/mips/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/mips/include/asm/types.h')
| -rw-r--r-- | arch/mips/include/asm/types.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h index 1228b25b290a..a845aafedee4 100644 --- a/arch/mips/include/asm/types.h +++ b/arch/mips/include/asm/types.h @@ -11,24 +11,12 @@ #ifndef _ASM_TYPES_H #define _ASM_TYPES_H -/* - * We don't use int-l64.h for the kernel anymore but still use it for - * userspace to avoid code changes. - */ -#ifdef __KERNEL__ # include <asm-generic/int-ll64.h> -#else -# if _MIPS_SZLONG == 64 -# include <asm-generic/int-l64.h> -# else -# include <asm-generic/int-ll64.h> -# endif -#endif +#include <uapi/asm/types.h> /* * These aren't exported outside the kernel to avoid name space clashes */ -#ifdef __KERNEL__ #ifndef __ASSEMBLY__ /* @@ -42,6 +30,4 @@ typedef unsigned long phys_t; #endif /* __ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif /* _ASM_TYPES_H */ |