diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-02-28 23:59:50 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2015-09-05 00:56:48 +0200 |
| commit | 20ae24739968ae7f94d0e73215d444042f91df78 (patch) | |
| tree | 11307718433f0af8e3f9826f9fd232fd0ad261f3 | |
| parent | CRIS: UAPI: use generic shmbuf.h (diff) | |
| download | linux-20ae24739968ae7f94d0e73215d444042f91df78.tar.xz linux-20ae24739968ae7f94d0e73215d444042f91df78.zip | |
CRIS: UAPI: use generic types.h
CRIS' types.h is functionally identical to the asm-generic version.
Effective diff:
+#ifndef _ASM_GENERIC_TYPES_H
+#define _ASM_GENERIC_TYPES_H
+
#include <asm-generic/int-ll64.h>
+
+#endif
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/cris/include/asm/types.h | 12 | ||||
| -rw-r--r-- | arch/cris/include/uapi/asm/types.h | 1 |
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index 17b5237aaf0a..b7f68192d15b 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@ -41,5 +41,6 @@ generic-y += sockios.h generic-y += statfs.h generic-y += topology.h generic-y += trace_clock.h +generic-y += types.h generic-y += vga.h generic-y += xor.h diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h deleted file mode 100644 index a3cac7757c7f..000000000000 --- a/arch/cris/include/asm/types.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _ETRAX_TYPES_H -#define _ETRAX_TYPES_H - -#include <uapi/asm/types.h> - -/* - * These aren't exported outside the kernel to avoid name space clashes - */ - -#define BITS_PER_LONG 32 - -#endif diff --git a/arch/cris/include/uapi/asm/types.h b/arch/cris/include/uapi/asm/types.h deleted file mode 100644 index 9ec9d4c5ac4d..000000000000 --- a/arch/cris/include/uapi/asm/types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/int-ll64.h> |