diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-28 09:23:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 09:23:13 +0100 |
| commit | 605c1a187f3ce82fbc243e2163c5ca8d1926df8e (patch) | |
| tree | c8065a8c5606a66f81dc494ce22a5baa5e0dfe7e /arch/mips/configs/cavium-octeon_defconfig | |
| parent | 17a2a9b57a9a7d2fd8f97df951b5e63e0bd56ef5 (diff) | |
| parent | ce9277fb08e6e721482f7011ca28dcd0449b197c (diff) | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
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 7afaa28a376..c8507bc8e92 100644 --- a/arch/mips/configs/cavium-octeon_defconfig +++ b/arch/mips/configs/cavium-octeon_defconfig @@ -9,7 +9,6 @@ CONFIG_MIPS=y # Machine selection # # CONFIG_MACH_ALCHEMY is not set -# CONFIG_BASLER_EXCITE is not set # CONFIG_BCM47XX is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set @@ -269,7 +268,6 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_CLASSIC_RCU=y -# CONFIG_PROBE_INITRD_HEADER is not set # CONFIG_FREEZER is not set # @@ -822,7 +820,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set -CONFIG_CMDLINE="" +# CONFIG_CMDLINE_BOOL is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_RUNTIME_DEBUG is not set |