summaryrefslogtreecommitdiff
path: root/arch/arm/configs/nhk8815_defconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-04 18:46:43 (GMT)
committerGrant Likely <grant.likely@secretlab.ca>2011-02-04 18:46:43 (GMT)
commitc64eae9a73a847c1698f913c893aa4012d2a30b0 (patch)
tree732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/arm/configs/nhk8815_defconfig
parentc9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadlinux-fsl-qoriq-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.xz
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/arm/configs/nhk8815_defconfig')
-rw-r--r--arch/arm/configs/nhk8815_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 0e2dc26..37207d1 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -7,7 +7,7 @@ CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_KALLSYMS_ALL=y
CONFIG_SLAB=y
CONFIG_MODULES=y