diff --git a/config-armv7 b/config-armv7 index 99b9b4825..e44e07f49 100644 --- a/config-armv7 +++ b/config-armv7 @@ -411,7 +411,7 @@ CONFIG_PINCTRL_ABX500=y CONFIG_PINCTRL_AB8500=y CONFIG_I2C_NOMADIK=m CONFIG_KEYBOARD_NOMADIK=m -# CONFIG_DB8500_CPUFREQ_COOLING is not set +CONFIG_DB8500_CPUFREQ_COOLING=m CONFIG_DB8500_THERMAL=y CONFIG_UX500_WATCHDOG=m CONFIG_INPUT_AB8500_PONKEY=m diff --git a/config-armv7-generic b/config-armv7-generic index 92129e41e..97699478a 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -233,6 +233,7 @@ CONFIG_W1_MASTER_GPIO=m CONFIG_CHARGER_GPIO=m CONFIG_SPI=y +CONFIG_SPI_MASTER=y CONFIG_SPI_GPIO=m CONFIG_SPI_BITBANG=m CONFIG_SPI_PL022=m diff --git a/kernel.spec b/kernel.spec index 01a48accf..b34a9dd90 100644 --- a/kernel.spec +++ b/kernel.spec @@ -473,6 +473,8 @@ Provides: kernel-highbank\ Provides: kernel-highbank-uname-r = %{KVERREL}%{?1:.%{1}}\ Provides: kernel-omap\ Provides: kernel-omap-uname-r = %{KVERREL}%{?1:.%{1}}\ +Provides: kernel-tegra\ +Provides: kernel-tegra-uname-r = %{KVERREL}%{?1:.%{1}}\ Requires(pre): %{kernel_prereq}\ Requires(pre): %{initrd_prereq}\ Requires(pre): linux-firmware >= 20120206-0.1.git06c8f81\ @@ -2226,6 +2228,9 @@ fi # ||----w | # || || %changelog +* Mon May 27 2013 Peter Robinson +- Minor ARM updates + * Fri May 24 2013 Josh Boyer - Add patch to quiet irq remapping failures (rhbz 948262)