diff options
| author | David Howells <dhowells@redhat.com> | 2011-12-13 16:07:49 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-12-13 16:07:49 +0100 |
| commit | 1632b9e2a14ce9f4e08faf6c4380431d63319bd3 (patch) | |
| tree | 572e45a2de74d233af5d98242bafbd193e074f43 /arch/arm/include/asm/swab.h | |
| parent | UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h (diff) | |
| download | linux-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.tar.xz linux-1632b9e2a14ce9f4e08faf6c4380431d63319bd3.zip | |
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
Split trivial #if defined(__KERNEL__) && X conditionals to make automated
disintegration easier.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/arm/include/asm/swab.h')
| -rw-r--r-- | arch/arm/include/asm/swab.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h index 9997ad20eff1..e82adf64d1dd 100644 --- a/arch/arm/include/asm/swab.h +++ b/arch/arm/include/asm/swab.h @@ -22,7 +22,8 @@ # define __SWAB_64_THRU_32__ #endif -#if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6 +#if defined(__KERNEL__) +#if __LINUX_ARM_ARCH__ >= 6 static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { @@ -38,8 +39,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) } #define __arch_swab32 __arch_swab32 -#else +#endif +#endif +#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6 static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __u32 t; |