diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-30 13:01:28 -0400 |
| commit | 6a50f368784f29b0772f265a05b9e395bb2c23ff (patch) | |
| tree | 80faccf654cbbaae2a0a74686db514f663623bb2 /config-armv7-generic | |
| parent | 498236e304bc3f3c936ef937b2a101b9e22f6544 (diff) | |
| download | kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip | |
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index fb4bb2852..5a24a4b58 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -156,8 +156,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_APPENDED_DTB=y # General vexpress ARM drivers -CONFIG_ARM_TIMER_SP804=y - CONFIG_SERIO_AMBAKMI=m CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y @@ -180,6 +178,7 @@ CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m # CONFIG_ARM_HIGHBANK_CPUIDLE is not set +CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m # AllWinner # CONFIG_MACH_SUN4I is not set @@ -591,8 +590,6 @@ CONFIG_INPUT_GPIO=m CONFIG_INPUT_GPIO_BEEPER=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_INPUT_MATRIXKMAP=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_KEYBOARD_GPIO_POLLED=m CONFIG_KEYBOARD_MATRIX=m # CONFIG_GPIO_RCAR is not set CONFIG_W1_MASTER_GPIO=m @@ -773,7 +770,6 @@ CONFIG_LCD_HX8357=m CONFIG_INPUT_GP2A=m CONFIG_INPUT_ARIZONA_HAPTICS=m CONFIG_INPUT_MC13783_PWRBUTTON=m -CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_AD7877=m @@ -825,9 +821,6 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y -# vfio -# CONFIG_VFIO_PLATFORM is not set - # Sensors CONFIG_SENSORS_HTU21=m |