diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-06 16:44:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 16:45:01 +0100 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /arch/x86/kernel/i8259.c | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core (diff) | |
| parent | Merge branch 'x86/uv' into x86/core (diff) | |
| download | linux-dev-f0ef03985130287c6c84ebe69416cf790e6cc00e.tar.xz linux-dev-f0ef03985130287c6c84ebe69416cf790e6cc00e.zip | |
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/x86/kernel/i8259.c')
| -rw-r--r-- | arch/x86/kernel/i8259.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index 11d5093eb281..df89102bef80 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c @@ -22,7 +22,6 @@ #include <asm/pgtable.h> #include <asm/desc.h> #include <asm/apic.h> -#include <asm/arch_hooks.h> #include <asm/i8259.h> /* |