diff options
Diffstat (limited to 'arch/mips/configs/cavium-octeon_defconfig')
-rw-r--r-- | arch/mips/configs/cavium-octeon_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/configs/cavium-octeon_defconfig b/arch/mips/configs/cavium-octeon_defconfig index 7afaa28a3768..c8507bc8e925 100644 --- a/arch/mips/configs/cavium-octeon_defconfig +++ b/arch/mips/configs/cavium-octeon_defconfig | |||
@@ -9,7 +9,6 @@ CONFIG_MIPS=y | |||
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_BASLER_EXCITE is not set | ||
13 | # CONFIG_BCM47XX is not set | 12 | # CONFIG_BCM47XX is not set |
14 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
15 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
@@ -269,7 +268,6 @@ CONFIG_DEFAULT_CFQ=y | |||
269 | # CONFIG_DEFAULT_NOOP is not set | 268 | # CONFIG_DEFAULT_NOOP is not set |
270 | CONFIG_DEFAULT_IOSCHED="cfq" | 269 | CONFIG_DEFAULT_IOSCHED="cfq" |
271 | CONFIG_CLASSIC_RCU=y | 270 | CONFIG_CLASSIC_RCU=y |
272 | # CONFIG_PROBE_INITRD_HEADER is not set | ||
273 | # CONFIG_FREEZER is not set | 271 | # CONFIG_FREEZER is not set |
274 | 272 | ||
275 | # | 273 | # |
@@ -822,7 +820,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
822 | # CONFIG_SAMPLES is not set | 820 | # CONFIG_SAMPLES is not set |
823 | CONFIG_HAVE_ARCH_KGDB=y | 821 | CONFIG_HAVE_ARCH_KGDB=y |
824 | # CONFIG_KGDB is not set | 822 | # CONFIG_KGDB is not set |
825 | CONFIG_CMDLINE="" | 823 | # CONFIG_CMDLINE_BOOL is not set |
826 | # CONFIG_DEBUG_STACK_USAGE is not set | 824 | # CONFIG_DEBUG_STACK_USAGE is not set |
827 | # CONFIG_RUNTIME_DEBUG is not set | 825 | # CONFIG_RUNTIME_DEBUG is not set |
828 | 826 | ||