diff --git a/config-arm-generic b/config-arm-generic index 24713b9..8b7f508 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -291,6 +291,8 @@ CONFIG_REGULATOR_TPS6507X=m CONFIG_CHARGER_MANAGER=y CONFIG_EXTCON_GPIO=m +# CONFIG_VFIO is not set + # CONFIG_XIP_KERNEL is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set diff --git a/kernel.spec b/kernel.spec index 572be69..a5c8cd4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2354,6 +2354,9 @@ fi # ||----w | # || || %changelog +* Mon Oct 22 2012 Peter Robinson +- VIFO fails on ARM at the moment so disable it for the time being + * Mon Oct 22 2012 Josh Boyer - CVE-2012-0957: uts: stack memory leak in UNAME26 (rhbz 862877 864824) - Fix rt2x00 usb reset resume (rhbz 856863)