diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/mips/configs/malta_defconfig | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/mips/configs/malta_defconfig')
| -rw-r--r-- | arch/mips/configs/malta_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 3f01870b4d65..d3c601206db2 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -10,7 +10,6 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
| 12 | # CONFIG_MACH_ALCHEMY is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
| 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 |
| @@ -1591,7 +1590,7 @@ CONFIG_FRAME_WARN=1024 | |||
| 1591 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1590 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
| 1592 | # CONFIG_SAMPLES is not set | 1591 | # CONFIG_SAMPLES is not set |
| 1593 | CONFIG_HAVE_ARCH_KGDB=y | 1592 | CONFIG_HAVE_ARCH_KGDB=y |
| 1594 | CONFIG_CMDLINE="" | 1593 | # CONFIG_CMDLINE_BOOL is not set |
| 1595 | 1594 | ||
| 1596 | # | 1595 | # |
| 1597 | # Security options | 1596 | # Security options |