diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 18:22:47 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 18:22:47 +1100 |
| commit | 48b1bf86c308532669571e929619e98a8d88ef54 (patch) | |
| tree | f37beaafc114ca07e9fc807ca8544a4b5d5e3386 /arch/powerpc/platforms/44x/iss4xx.c | |
| parent | 4666ca2aa344105da0da3afda48d987c82261c05 (diff) | |
| parent | 09dc34a95bfbc6062e1e7de0b96175480924aea8 (diff) | |
Merge branch 'mpic' into next
Diffstat (limited to 'arch/powerpc/platforms/44x/iss4xx.c')
| -rw-r--r-- | arch/powerpc/platforms/44x/iss4xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c index 19395f18b1d..5b8cdbb82f8 100644 --- a/arch/powerpc/platforms/44x/iss4xx.c +++ b/arch/powerpc/platforms/44x/iss4xx.c @@ -71,7 +71,7 @@ static void __init iss4xx_init_irq(void) /* The MPIC driver will get everything it needs from the * device-tree, just pass 0 to all arguments */ - struct mpic *mpic = mpic_alloc(np, 0, MPIC_PRIMARY, 0, 0, + struct mpic *mpic = mpic_alloc(np, 0, 0, 0, 0, " MPIC "); BUG_ON(mpic == NULL); mpic_init(mpic); |