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/maple/setup.c | |
| parent | 4666ca2aa344105da0da3afda48d987c82261c05 (diff) | |
| parent | 09dc34a95bfbc6062e1e7de0b96175480924aea8 (diff) | |
Merge branch 'mpic' into next
Diffstat (limited to 'arch/powerpc/platforms/maple/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 4c372047c94..0bcbfe7b2c5 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -221,7 +221,7 @@ static void __init maple_init_IRQ(void) unsigned long openpic_addr = 0; int naddr, n, i, opplen, has_isus = 0; struct mpic *mpic; - unsigned int flags = MPIC_PRIMARY; + unsigned int flags = 0; /* Locate MPIC in the device-tree. Note that there is a bug * in Maple device-tree where the type of the controller is |