diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-01-11 07:02:57 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-01-11 07:02:57 -0600 |
| commit | 98c31c1d6c9c8a7e57cdac96ad574e0e172d3192 (patch) | |
| tree | ab870590bfaf03fb8f9a41b7f61f0b329cd33498 /arch/powerpc/sysdev | |
| parent | 78994e240fce03832ceebc875c43773a2c615e79 (diff) | |
| parent | f67702a37533f59eee3386578450eeeb531da279 (diff) | |
Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/xilinx_intc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index c2f17cc43df..ba8eea2bcce 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c @@ -135,10 +135,16 @@ void __init xilinx_intc_init_tree(void) struct device_node *np; /* find top level interrupt controller */ - for_each_compatible_node(np, NULL, "xilinx,intc") { + for_each_compatible_node(np, NULL, "xlnx,opb-intc-1.00.c") { if (!of_get_property(np, "interrupts", NULL)) break; } + if (!np) { + for_each_compatible_node(np, NULL, "xlnx,xps-intc-1.00.a") { + if (!of_get_property(np, "interrupts", NULL)) + break; + } + } /* xilinx interrupt controller needs to be top level */ BUG_ON(!np); |