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/pb1500_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/pb1500_defconfig')
| -rw-r--r-- | arch/mips/configs/pb1500_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index e74ba794c789..5ec60836b645 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
| @@ -23,7 +23,6 @@ CONFIG_MIPS_PB1500=y | |||
| 23 | # CONFIG_MIPS_DB1550 is not set | 23 | # CONFIG_MIPS_DB1550 is not set |
| 24 | # CONFIG_MIPS_DB1200 is not set | 24 | # CONFIG_MIPS_DB1200 is not set |
| 25 | # CONFIG_MIPS_MIRAGE is not set | 25 | # CONFIG_MIPS_MIRAGE is not set |
| 26 | # CONFIG_BASLER_EXCITE is not set | ||
| 27 | # CONFIG_MIPS_COBALT is not set | 26 | # CONFIG_MIPS_COBALT is not set |
| 28 | # CONFIG_MACH_DECSTATION is not set | 27 | # CONFIG_MACH_DECSTATION is not set |
| 29 | # CONFIG_MACH_JAZZ is not set | 28 | # CONFIG_MACH_JAZZ is not set |
| @@ -1200,7 +1199,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1200 | # CONFIG_DEBUG_KERNEL is not set | 1199 | # CONFIG_DEBUG_KERNEL is not set |
| 1201 | CONFIG_LOG_BUF_SHIFT=14 | 1200 | CONFIG_LOG_BUF_SHIFT=14 |
| 1202 | CONFIG_CROSSCOMPILE=y | 1201 | CONFIG_CROSSCOMPILE=y |
| 1203 | CONFIG_CMDLINE="" | 1202 | # CONFIG_CMDLINE_BOOL is not set |
| 1204 | 1203 | ||
| 1205 | # | 1204 | # |
| 1206 | # Security options | 1205 | # Security options |