diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /arch/x86/include/asm/swab.h | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/include/asm/swab.h')
| -rw-r--r-- | arch/x86/include/asm/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/swab.h b/arch/x86/include/asm/swab.h index 306d4178ffc9..557cd9f00661 100644 --- a/arch/x86/include/asm/swab.h +++ b/arch/x86/include/asm/swab.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _ASM_X86_SWAB_H | 1 | #ifndef _ASM_X86_SWAB_H |
| 2 | #define _ASM_X86_SWAB_H | 2 | #define _ASM_X86_SWAB_H |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
| 6 | 6 | ||
| 7 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | 7 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) |