summaryrefslogtreecommitdiffstats
path: root/arch/m32r/configs/mappi.nommu_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-04 19:46:43 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-02-04 19:46:43 +0100
commitc64eae9a73a847c1698f913c893aa4012d2a30b0 (patch)
tree732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/m32r/configs/mappi.nommu_defconfig
parentdriver-core: remove conditionals around devicetree pointers (diff)
parentLinux 2.6.38-rc3 (diff)
downloadlinux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.xz
linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.zip
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/m32r/configs/mappi.nommu_defconfig')
-rw-r--r--arch/m32r/configs/mappi.nommu_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/configs/mappi.nommu_defconfig b/arch/m32r/configs/mappi.nommu_defconfig
index 354a964d084d..7c90ce2fc42b 100644
--- a/arch/m32r/configs/mappi.nommu_defconfig
+++ b/arch/m32r/configs/mappi.nommu_defconfig
@@ -3,7 +3,7 @@ CONFIG_BSD_PROCESS_ACCT=y
CONFIG_IKCONFIG=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
# CONFIG_KALLSYMS is not set
# CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set