diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:32:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:33:14 +0100 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /arch/blackfin/configs/BlackStamp_defconfig | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
| download | kernel_samsung_crespo-f19693a17c6705e197eb24d4618060eaac1b535c.zip kernel_samsung_crespo-f19693a17c6705e197eb24d4618060eaac1b535c.tar.gz kernel_samsung_crespo-f19693a17c6705e197eb24d4618060eaac1b535c.tar.bz2 | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/blackfin/configs/BlackStamp_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BlackStamp_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig index dae7adf..97ebe09 100644 --- a/arch/blackfin/configs/BlackStamp_defconfig +++ b/arch/blackfin/configs/BlackStamp_defconfig @@ -6,7 +6,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y # CONFIG_SYSCTL_SYSCALL is not set # CONFIG_ELF_CORE is not set # CONFIG_FUTEX is not set |