diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /include/asm-m32r | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'include/asm-m32r')
| -rw-r--r-- | include/asm-m32r/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/swab.h b/include/asm-m32r/swab.h index 97973e101825..54dab001d6d1 100644 --- a/include/asm-m32r/swab.h +++ b/include/asm-m32r/swab.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _ASM_M32R_SWAB_H | 1 | #ifndef _ASM_M32R_SWAB_H |
| 2 | #define _ASM_M32R_SWAB_H | 2 | #define _ASM_M32R_SWAB_H |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | 6 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 7 | # define __SWAB_64_THRU_32__ | 7 | # define __SWAB_64_THRU_32__ |