diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:22:31 +0900 |
commit | 02a650e2820e19fde8f6a49752027217fdd33d78 (patch) | |
tree | 92d97b79941c0cee9a1da1e8a21abc7a661aa0f5 /arch/avr32/include/asm/types.h | |
parent | b6897130f0ac8ac33043be736770eb5f58164044 (diff) | |
parent | 7190632b78de594f3dabe174e9df373bfc790d89 (diff) | |
download | linux-3.10-02a650e2820e19fde8f6a49752027217fdd33d78.tar.gz linux-3.10-02a650e2820e19fde8f6a49752027217fdd33d78.tar.bz2 linux-3.10-02a650e2820e19fde8f6a49752027217fdd33d78.zip |
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for misc arches from David Howells:
"UAPI disintegration for MN10300, FRV and AVR32 arches"
* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
UAPI: (Scripted) Disintegrate arch/frv/include/asm
UAPI: (Scripted) Disintegrate arch/avr32/include/asm
Diffstat (limited to 'arch/avr32/include/asm/types.h')
-rw-r--r-- | arch/avr32/include/asm/types.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/avr32/include/asm/types.h b/arch/avr32/include/asm/types.h index 9bb2d8b2e6c..59324058069 100644 --- a/arch/avr32/include/asm/types.h +++ b/arch/avr32/include/asm/types.h @@ -8,16 +8,12 @@ #ifndef __ASM_AVR32_TYPES_H #define __ASM_AVR32_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_AVR32_TYPES_H */ |