diff options
Diffstat (limited to 'arch/mips/configs/ar7_defconfig')
-rw-r--r-- | arch/mips/configs/ar7_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig index 35648302f7cc..5a5b6ba7514e 100644 --- a/arch/mips/configs/ar7_defconfig +++ b/arch/mips/configs/ar7_defconfig | |||
@@ -10,7 +10,6 @@ CONFIG_MIPS=y | |||
10 | # | 10 | # |
11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | CONFIG_AR7=y | 12 | CONFIG_AR7=y |
13 | # CONFIG_BASLER_EXCITE is not set | ||
14 | # CONFIG_BCM47XX is not set | 13 | # CONFIG_BCM47XX is not set |
15 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
16 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
@@ -265,7 +264,6 @@ CONFIG_DEFAULT_DEADLINE=y | |||
265 | # CONFIG_DEFAULT_CFQ is not set | 264 | # CONFIG_DEFAULT_CFQ is not set |
266 | # CONFIG_DEFAULT_NOOP is not set | 265 | # CONFIG_DEFAULT_NOOP is not set |
267 | CONFIG_DEFAULT_IOSCHED="deadline" | 266 | CONFIG_DEFAULT_IOSCHED="deadline" |
268 | CONFIG_PROBE_INITRD_HEADER=y | ||
269 | # CONFIG_FREEZER is not set | 267 | # CONFIG_FREEZER is not set |
270 | 268 | ||
271 | # | 269 | # |
@@ -1053,7 +1051,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1053 | # CONFIG_DYNAMIC_DEBUG is not set | 1051 | # CONFIG_DYNAMIC_DEBUG is not set |
1054 | # CONFIG_SAMPLES is not set | 1052 | # CONFIG_SAMPLES is not set |
1055 | CONFIG_HAVE_ARCH_KGDB=y | 1053 | CONFIG_HAVE_ARCH_KGDB=y |
1054 | CONFIG_CMDLINE_BOOL=y | ||
1056 | CONFIG_CMDLINE="rootfstype=squashfs,jffs2" | 1055 | CONFIG_CMDLINE="rootfstype=squashfs,jffs2" |
1056 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1057 | 1057 | ||
1058 | # | 1058 | # |
1059 | # Security options | 1059 | # Security options |