diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/mips/configs/pb1550_defconfig | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/configs/pb1550_defconfig')
| -rw-r--r-- | arch/mips/configs/pb1550_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index 7956f56cbf3e..1d896fd830da 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
| @@ -115,7 +115,6 @@ CONFIG_MIPS_MT_DISABLED=y | |||
| 115 | # CONFIG_MIPS_MT_SMTC is not set | 115 | # CONFIG_MIPS_MT_SMTC is not set |
| 116 | # CONFIG_MIPS_VPE_LOADER is not set | 116 | # CONFIG_MIPS_VPE_LOADER is not set |
| 117 | CONFIG_64BIT_PHYS_ADDR=y | 117 | CONFIG_64BIT_PHYS_ADDR=y |
| 118 | CONFIG_CPU_HAS_LLSC=y | ||
| 119 | CONFIG_CPU_HAS_SYNC=y | 118 | CONFIG_CPU_HAS_SYNC=y |
| 120 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
| 121 | CONFIG_GENERIC_IRQ_PROBE=y | 120 | CONFIG_GENERIC_IRQ_PROBE=y |