diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:44:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:45:01 -0500 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /arch/avr32 | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/Kconfig | 2 | ||||
| -rw-r--r-- | arch/avr32/include/asm/swab.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index b189680d18b0..05fe3053dcae 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -181,7 +181,7 @@ source "kernel/Kconfig.preempt" | |||
| 181 | config QUICKLIST | 181 | config QUICKLIST |
| 182 | def_bool y | 182 | def_bool y |
| 183 | 183 | ||
| 184 | config HAVE_ARCH_BOOTMEM_NODE | 184 | config HAVE_ARCH_BOOTMEM |
| 185 | def_bool n | 185 | def_bool n |
| 186 | 186 | ||
| 187 | config ARCH_HAVE_MEMORY_PRESENT | 187 | config ARCH_HAVE_MEMORY_PRESENT |
diff --git a/arch/avr32/include/asm/swab.h b/arch/avr32/include/asm/swab.h index a14aa5b46d98..14cc737bbca6 100644 --- a/arch/avr32/include/asm/swab.h +++ b/arch/avr32/include/asm/swab.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #ifndef __ASM_AVR32_SWAB_H | 4 | #ifndef __ASM_AVR32_SWAB_H |
| 5 | #define __ASM_AVR32_SWAB_H | 5 | #define __ASM_AVR32_SWAB_H |
| 6 | 6 | ||
| 7 | #include <asm/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/compiler.h> | 8 | #include <linux/compiler.h> |
| 9 | 9 | ||
| 10 | #define __SWAB_64_THRU_32__ | 10 | #define __SWAB_64_THRU_32__ |