diff options
| author | Olof Johansson <olof@lixom.net> | 2013-11-26 12:42:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-11-26 12:42:08 -0800 |
| commit | a32555249f54dd511b61e7a388aa522809b12c82 (patch) | |
| tree | c8406a332c6bd2e66e71b942433b6cba8d028ece | |
| parent | 75cc4d470cec5f46888a6dbeddf243502c06810d (diff) | |
| parent | 59b023e9bf62933f7078dec339b110d5785f63f6 (diff) | |
| download | fcoe-a32555249f54dd511b61e7a388aa522809b12c82.tar.gz | |
Merge tag 'ux500-defconfig-v3.13-rcs' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
From Linus Walleij, Ux500 defconfig patches for the v3.13 rc series:
- Allow creation and mounting of devtmpfs, which is used
by OpenEmbedded root filesystems among others.
- Enable CPUidle for the ux500, it has been accidentally
disabled due to a Kconfig change.
* tag 'ux500-defconfig-v3.13-rcs' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: u8500_defconfig: add missing cpuidle option
u8500_defconfig: allow creation and mounting of devtmpfs
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index ac632cc38f2497..c6ebc184bf6820 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -22,6 +22,7 @@ CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8" CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y +CONFIG_ARM_U8500_CPUIDLE=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_PM_RUNTIME=y @@ -109,6 +110,8 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS=y CONFIG_VFAT_FS=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y # CONFIG_MISC_FILESYSTEMS is not set |