diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:02:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:02:57 -0400 |
commit | f541ae326fa120fa5c57433e4d9a133df212ce41 (patch) | |
tree | bdbd94ec72cfc601118051cb35e8617d55510177 /arch/powerpc/platforms/85xx/ksi8560.c | |
parent | e255357764f92afcafafbd4879b222b8c752065a (diff) | |
parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) |
Merge branch 'linus' into perfcounters/core-v2
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/platforms/85xx/ksi8560.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/ksi8560.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c index 81cee7bbf2d2..f4d36b5a2e00 100644 --- a/arch/powerpc/platforms/85xx/ksi8560.c +++ b/arch/powerpc/platforms/85xx/ksi8560.c | |||
@@ -106,8 +106,6 @@ static void __init ksi8560_pic_init(void) | |||
106 | cpm2_pic_init(np); | 106 | cpm2_pic_init(np); |
107 | of_node_put(np); | 107 | of_node_put(np); |
108 | set_irq_chained_handler(irq, cpm2_cascade); | 108 | set_irq_chained_handler(irq, cpm2_cascade); |
109 | |||
110 | setup_irq(0, NULL); | ||
111 | #endif | 109 | #endif |
112 | } | 110 | } |
113 | 111 | ||
@@ -221,6 +219,7 @@ static struct of_device_id __initdata of_bus_ids[] = { | |||
221 | { .type = "simple-bus", }, | 219 | { .type = "simple-bus", }, |
222 | { .name = "cpm", }, | 220 | { .name = "cpm", }, |
223 | { .name = "localbus", }, | 221 | { .name = "localbus", }, |
222 | { .compatible = "gianfar", }, | ||
224 | {}, | 223 | {}, |
225 | }; | 224 | }; |
226 | 225 | ||