diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
| commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
| tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /arch/mips/sibyte/Kconfig | |
| parent | c5580a7ecb859c6821dd761c95fa150ec7695ae1 (diff) | |
| parent | 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/mips/sibyte/Kconfig')
| -rw-r--r-- | arch/mips/sibyte/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig index de46f62ac46..816aee7fcd2 100644 --- a/arch/mips/sibyte/Kconfig +++ b/arch/mips/sibyte/Kconfig @@ -102,11 +102,11 @@ config SIMULATION Build a kernel suitable for running under the GDB simulator. Primarily adjusts the kernel's notion of time. -config CONFIG_SB1_CEX_ALWAYS_FATAL +config SB1_CEX_ALWAYS_FATAL bool "All cache exceptions considered fatal (no recovery attempted)" depends on SIBYTE_SB1xxx_SOC -config CONFIG_SB1_CERR_STALL +config SB1_CERR_STALL bool "Stall (rather than panic) on fatal cache error" depends on SIBYTE_SB1xxx_SOC |