diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/m68k/include/asm/swab.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/m68k/include/asm/swab.h')
| -rw-r--r-- | arch/m68k/include/asm/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index 5b754aace744..b7b37a40defc 100644 --- a/arch/m68k/include/asm/swab.h +++ b/arch/m68k/include/asm/swab.h | |||
| @@ -14,7 +14,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | |||
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | #define __arch_swab32 __arch_swab32 | 16 | #define __arch_swab32 __arch_swab32 |
| 17 | #elif !defined(__uClinux__) | 17 | #elif !defined(__mcoldfire__) |
| 18 | 18 | ||
| 19 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | 19 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) |
| 20 | { | 20 | { |