summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/workpad_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-04 11:46:43 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-02-04 11:46:43 -0700
commitc64eae9a73a847c1698f913c893aa4012d2a30b0 (patch)
tree732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/mips/configs/workpad_defconfig
parentc9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadblackbird-op-linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.gz
blackbird-op-linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.zip
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/mips/configs/workpad_defconfig')
-rw-r--r--arch/mips/configs/workpad_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 7ec9287254d8..ee4b2be43c44 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -4,7 +4,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
OpenPOWER on IntegriCloud