diff --git a/config-armv7 b/config-armv7 index 01d3cc24c..cd0abf265 100644 --- a/config-armv7 +++ b/config-armv7 @@ -411,6 +411,7 @@ CONFIG_REGULATOR_MC13783=m CONFIG_REGULATOR_MC13892=m CONFIG_LEDS_MC13783=m CONFIG_RTC_DRV_MC13XXX=m +CONFIG_CAN_FLEXCAN=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_88PM80X_ONKEY=m diff --git a/config-armv7-generic b/config-armv7-generic index 1d12b449b..980e5ff10 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -405,6 +405,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 +CONFIG_SRAM=y # Ethernet CONFIG_KS8851=m diff --git a/kernel.spec b/kernel.spec index 7d9e328ba..fa7c13a37 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2264,6 +2264,9 @@ fi # ||----w | # || || %changelog +* Tue Oct 22 2013 Peter Robinson +- Minor ARM config update + * Mon Oct 21 2013 Kyle McMartin - aarch64: add AFTER_LINK to $vdsold for debuginfo generation of the vdso.