diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 12:48:53 +0100 |
| commit | e61ac0b05c53f5b56f3ea623c215437c09d8265b (patch) | |
| tree | 70f97df839761058f2367d40c629b87e8e932a19 /arch/cris/include/asm/types.h | |
| parent | 8e6b4dd1e1fbe81e7f9756eb8299632de641b2e1 (diff) | |
| parent | e717abac8a9f65eee6de3bb37e10c6916bced483 (diff) | |
| download | op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.zip op-kernel-dev-e61ac0b05c53f5b56f3ea623c215437c09d8265b.tar.gz | |
Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
UAPI Disintegration 2012-10-09
* tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/cris/include/asm
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
Diffstat (limited to 'arch/cris/include/asm/types.h')
| -rw-r--r-- | arch/cris/include/asm/types.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/cris/include/asm/types.h b/arch/cris/include/asm/types.h index adaf827..a3cac77 100644 --- a/arch/cris/include/asm/types.h +++ b/arch/cris/include/asm/types.h @@ -1,15 +1,12 @@ #ifndef _ETRAX_TYPES_H #define _ETRAX_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 |
