diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2006-10-04 17:26:23 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-05 09:21:02 +1000 |
| commit | f7e2ce788677ca0996d360202b91524db894c7b2 (patch) | |
| tree | d16c60f5726bed2c15c84da069408ae0d5970724 | |
| parent | 68272047c51145a8aa4f3b6ae27edae6986c28cc (diff) | |
| download | op-kernel-dev-f7e2ce788677ca0996d360202b91524db894c7b2.zip op-kernel-dev-f7e2ce788677ca0996d360202b91524db894c7b2.tar.gz | |
[POWERPC] spiderpic: enable new style devtree support
This enables support for new firmware test releases.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/platforms/cell/spider-pic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index 608b1eb..6794de0 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c @@ -244,7 +244,6 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) int imaplen, intsize, unit; struct device_node *iic; -#if 0 /* Enable that when we have a way to retreive the node as well */ /* First, we check wether we have a real "interrupts" in the device * tree in case the device-tree is ever fixed */ @@ -252,9 +251,8 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic) if (of_irq_map_one(pic->of_node, 0, &oirq) == 0) { virq = irq_create_of_mapping(oirq.controller, oirq.specifier, oirq.size); - goto bail; + return virq; } -#endif /* Now do the horrible hacks */ tmp = get_property(pic->of_node, "#interrupt-cells", NULL); |
