diff options
| author | Ingo Molnar | 2009-02-13 21:05:03 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-13 21:05:03 +0100 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/blackfin | |
| parent | x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined (diff) | |
| parent | unconditionally include asm/types.h from linux/types.h (diff) | |
| download | kernel-qcow2-linux-22796b15725488002437ebbf98a22fdbe596cf89.tar.gz kernel-qcow2-linux-22796b15725488002437ebbf98a22fdbe596cf89.tar.xz kernel-qcow2-linux-22796b15725488002437ebbf98a22fdbe596cf89.zip | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/include/asm/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/swab.h b/arch/blackfin/include/asm/swab.h index 69a051b612bd..6403ad2932eb 100644 --- a/arch/blackfin/include/asm/swab.h +++ b/arch/blackfin/include/asm/swab.h @@ -1,7 +1,7 @@ #ifndef _BLACKFIN_SWAB_H #define _BLACKFIN_SWAB_H -#include <asm/types.h> +#include <linux/types.h> #include <linux/compiler.h> #if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__) |