diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/mips/configs/pnx8335-stb225_defconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/mips/configs/pnx8335-stb225_defconfig')
| -rw-r--r-- | arch/mips/configs/pnx8335-stb225_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/pnx8335-stb225_defconfig b/arch/mips/configs/pnx8335-stb225_defconfig index 39926a1a96b6..f2925769dfa3 100644 --- a/arch/mips/configs/pnx8335-stb225_defconfig +++ b/arch/mips/configs/pnx8335-stb225_defconfig | |||
| @@ -11,7 +11,7 @@ CONFIG_EXPERIMENTAL=y | |||
| 11 | CONFIG_SYSVIPC=y | 11 | CONFIG_SYSVIPC=y |
| 12 | CONFIG_LOG_BUF_SHIFT=14 | 12 | CONFIG_LOG_BUF_SHIFT=14 |
| 13 | CONFIG_SYSFS_DEPRECATED_V2=y | 13 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 14 | CONFIG_EMBEDDED=y | 14 | CONFIG_EXPERT=y |
| 15 | CONFIG_SLAB=y | 15 | CONFIG_SLAB=y |
| 16 | CONFIG_MODULES=y | 16 | CONFIG_MODULES=y |
| 17 | CONFIG_MODULE_UNLOAD=y | 17 | CONFIG_MODULE_UNLOAD=y |