diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:24:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 07:24:17 -0800 |
| commit | 0c5445015c8e37d4f79c16fa51be398c4cb0e46c (patch) | |
| tree | d5043bad8b42de2872d18f4a5c8ff63492718d88 /arch/cris/include/asm/swab.h | |
| parent | 1ffab3d4139533eff6e27b7568825307e575faa6 (diff) | |
| parent | 77c8006d8df4d5bafeb1d15eafa0886ae96e9b17 (diff) | |
Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson.
... mainly the UAPI disintegration.
* tag 'cris-for-linus-3.8' of git://jni.nu/cris:
UAPI: Fix up empty files in arch/cris/
CRIS: locking: fix the return value of arch_read_trylock()
CRIS: use kbuild.h instead of defining macros in asm-offset.c
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/swab.h')
| -rw-r--r-- | arch/cris/include/asm/swab.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/include/asm/swab.h b/arch/cris/include/asm/swab.h index 80668e88419c..991b6ace1ba9 100644 --- a/arch/cris/include/asm/swab.h +++ b/arch/cris/include/asm/swab.h @@ -1,8 +1,7 @@ #ifndef _CRIS_SWAB_H #define _CRIS_SWAB_H -#ifdef __KERNEL__ #include <arch/swab.h> -#endif /* __KERNEL__ */ +#include <uapi/asm/swab.h> #endif /* _CRIS_SWAB_H */ |