diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:46:43 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:46:43 -0700 |
commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/mips/configs/bcm47xx_defconfig | |
parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
download | kernel_samsung_crespo-c64eae9a73a847c1698f913c893aa4012d2a30b0.zip kernel_samsung_crespo-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.gz kernel_samsung_crespo-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.bz2 |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/mips/configs/bcm47xx_defconfig')
-rw-r--r-- | arch/mips/configs/bcm47xx_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig index 927d58b..22fdf2f 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig @@ -21,7 +21,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_RD_LZMA=y -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y |