diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-08-03 21:11:26 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-08-03 21:11:26 +0100 |
| commit | b958f0c6debac4883288e929194327099901c461 (patch) | |
| tree | 60862d0ab8dae815187889370d24e7b15629fbdf | |
| parent | 8e011f011e984b2d52ee8d639ab88ef734a8497f (diff) | |
| download | kernel-b958f0c6debac4883288e929194327099901c461.tar.gz kernel-b958f0c6debac4883288e929194327099901c461.tar.xz kernel-b958f0c6debac4883288e929194327099901c461.zip | |
Minor config updates for Armada and Sunxi ARM devices
| -rw-r--r-- | config-armv7 | 6 | ||||
| -rw-r--r-- | config-armv7-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7 index 6dd7ced4e..03f43354f 100644 --- a/config-armv7 +++ b/config-armv7 @@ -25,9 +25,9 @@ CONFIG_ARCH_ZYNQ=y # mvebu CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y -# CONFIG_MACH_ARMADA_375 is not set -# CONFIG_MACH_ARMADA_38X is not set CONFIG_MACH_DOVE=y CONFIG_MVEBU_DEVBUS=y @@ -508,7 +508,7 @@ CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y CONFIG_ABX500_CORE=y -CONFIG_ARM_U8500_CPUIDLE=y +# CONFIG_ARM_U8500_CPUIDLE is not set CONFIG_UX500_DEBUG_UART=2 CONFIG_AB8500_CORE=y CONFIG_STE_DMA40=y diff --git a/config-armv7-generic b/config-armv7-generic index be7822bd3..058b9514b 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -181,6 +181,8 @@ CONFIG_I2C_SUN6I_P2WI=m CONFIG_GPIO_PCA953X=m CONFIG_POWER_RESET_SUN6I=y CONFIG_TOUCHSCREEN_SUN4I=m +CONFIG_MFD_AXP20X=y +CONFIG_REGULATOR_AXP20X=m # Exynos CONFIG_ARCH_EXYNOS3=y diff --git a/kernel.spec b/kernel.spec index 571f070dc..4670fb0e6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2253,6 +2253,9 @@ fi # ||----w | # || || %changelog +* Sun Aug 3 2014 Peter Robinson <pbrobinson@redhat.com> +- Minor config updates for Armada and Sunxi ARM devices + * Fri Aug 01 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc7.git4.1 - Linux v3.16-rc7-84-g6f0928036bcb |