diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
| commit | 0b6de0092244c98b5ba1abda34c92470a20e0d0c (patch) | |
| tree | 478e4e18c33fd9fa517559e1ce951fe378d5965f /arch/xtensa/include/asm/swab.h | |
| parent | 37a25424252b6cff4dd4b1937ab6a1dbfcadabcc (diff) | |
| parent | f62bae5009c1ba596cd475cafbc83e0570a36e26 (diff) | |
Merge branch 'x86/apic' into perfcounters/core
Conflicts:
arch/x86/kernel/cpu/perfctr-watchdog.c
Diffstat (limited to 'arch/xtensa/include/asm/swab.h')
| -rw-r--r-- | arch/xtensa/include/asm/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/swab.h b/arch/xtensa/include/asm/swab.h index f50b697eb60..226a3916231 100644 --- a/arch/xtensa/include/asm/swab.h +++ b/arch/xtensa/include/asm/swab.h @@ -11,7 +11,7 @@ #ifndef _XTENSA_SWAB_H #define _XTENSA_SWAB_H -#include <asm/types.h> +#include <linux/types.h> #include <linux/compiler.h> #define __SWAB_64_THRU_32__ |