diff options
author | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 15:48:53 +0400 |
---|---|---|
committer | Jesper Nilsson <jesper@jni.nu> | 2012-12-20 15:48:53 +0400 |
commit | e61ac0b05c53f5b56f3ea623c215437c09d8265b (patch) | |
tree | 70f97df839761058f2367d40c629b87e8e932a19 /arch/cris/include/asm/swab.h | |
parent | 8e6b4dd1e1fbe81e7f9756eb8299632de641b2e1 (diff) | |
parent | e717abac8a9f65eee6de3bb37e10c6916bced483 (diff) | |
download | linux-e61ac0b05c53f5b56f3ea623c215437c09d8265b.tar.xz |
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/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 */ |