aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/types.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-12-19 16:07:18 +0000
committerDavid Howells <dhowells@redhat.com>2012-12-19 16:07:18 +0000
commitf7f4dc10e1eb04eb8426a192a314b64444a333f4 (patch)
tree9a78fadd240ed14da75dd1f3a876a4ab58df9c34 /arch/m32r/include/asm/types.h
parentMerge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux (diff)
downloadlinux-dev-f7f4dc10e1eb04eb8426a192a314b64444a333f4.tar.xz
linux-dev-f7f4dc10e1eb04eb8426a192a314b64444a333f4.zip
UAPI: (Scripted) Disintegrate arch/m32r/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/m32r/include/asm/types.h')
-rw-r--r--arch/m32r/include/asm/types.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h
index bb2eeadecf99..04a44c6ee34d 100644
--- a/arch/m32r/include/asm/types.h
+++ b/arch/m32r/include/asm/types.h
@@ -1,15 +1,12 @@
#ifndef _ASM_M32R_TYPES_H
#define _ASM_M32R_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <uapi/asm/types.h>
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
-#ifdef __KERNEL__
#define BITS_PER_LONG 32
-#endif /* __KERNEL__ */
-
#endif /* _ASM_M32R_TYPES_H */