diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 14:55:36 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 14:55:36 +0200 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /arch/mips/configs/pnx8550-stb810_defconfig | |
| parent | m25p80: Add Spansion S25FL129P serial flashes (diff) | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-6469f540ea37d53db089c8fea9c0c77a3d9353d4.tar.xz linux-6469f540ea37d53db089c8fea9c0c77a3d9353d4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
Diffstat (limited to 'arch/mips/configs/pnx8550-stb810_defconfig')
| -rw-r--r-- | arch/mips/configs/pnx8550-stb810_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig index b5052fb42e9e..5ed3c8dfa0a1 100644 --- a/arch/mips/configs/pnx8550-stb810_defconfig +++ b/arch/mips/configs/pnx8550-stb810_defconfig @@ -112,7 +112,6 @@ CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMTC is not set # CONFIG_MIPS_VPE_LOADER is not set # CONFIG_64BIT_PHYS_ADDR is not set -CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y |