diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:45 -0500 |
| commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
| tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/configs/imx_v4_v5_defconfig | |
| parent | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (diff) | |
| parent | 48d224d1efec98b0b78e511150b4f5752beceb7c (diff) | |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 78ed575feb1a..f71302c3ac33 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
| @@ -18,7 +18,9 @@ CONFIG_MODULE_UNLOAD=y | |||
| 18 | # CONFIG_IOSCHED_DEADLINE is not set | 18 | # CONFIG_IOSCHED_DEADLINE is not set |
| 19 | # CONFIG_IOSCHED_CFQ is not set | 19 | # CONFIG_IOSCHED_CFQ is not set |
| 20 | CONFIG_ARCH_MXC=y | 20 | CONFIG_ARCH_MXC=y |
| 21 | CONFIG_ARCH_IMX_V4_V5=y | 21 | CONFIG_ARCH_MULTI_V4T=y |
| 22 | CONFIG_ARCH_MULTI_V5=y | ||
| 23 | # CONFIG_ARCH_MULTI_V7 is not set | ||
| 22 | CONFIG_ARCH_MX1ADS=y | 24 | CONFIG_ARCH_MX1ADS=y |
| 23 | CONFIG_MACH_SCB9328=y | 25 | CONFIG_MACH_SCB9328=y |
| 24 | CONFIG_MACH_APF9328=y | 26 | CONFIG_MACH_APF9328=y |