diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-25 07:09:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-25 07:10:00 -0400 |
| commit | 7de5d895b2020260190db0021de646f3f22f755e (patch) | |
| tree | 51d012f0b76a2ec1bd3b4837690faf1087f37056 /arch/powerpc/platforms/Kconfig | |
| parent | 04fba67163a9e6132614b72b33bb2743bd33ffb3 (diff) | |
| parent | 502adf5778f4151dcba3f64dd6ed322151f3712c (diff) | |
Merge branch 'linus' into perf/core
Merge reason: pick up perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index d1663db7810..81c9208025f 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
| @@ -106,8 +106,7 @@ config MMIO_NVRAM | |||
| 106 | 106 | ||
| 107 | config MPIC_U3_HT_IRQS | 107 | config MPIC_U3_HT_IRQS |
| 108 | bool | 108 | bool |
| 109 | depends on PPC_MAPLE | 109 | default n |
| 110 | default y | ||
| 111 | 110 | ||
| 112 | config MPIC_BROKEN_REGREAD | 111 | config MPIC_BROKEN_REGREAD |
| 113 | bool | 112 | bool |