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-arm-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-arm-generic')
| -rw-r--r-- | config-arm-generic | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/config-arm-generic b/config-arm-generic index d884c8694..6730625dd 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -59,7 +59,6 @@ CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_8250_DW=y CONFIG_SERIO_AMBAKMI=y CONFIG_FB_ARMCLCD=y @@ -68,6 +67,7 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_MFD_VEXPRESS_SYSREG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_COMMON_CLK_VERSATILE=y +CONFIG_ARM_TIMER_SP804=y CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y CONFIG_I2C_VERSATILE=m @@ -189,6 +189,9 @@ CONFIG_GPIOLIB=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_BACKLIGHT_GPIO=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_RESTART=y @@ -233,6 +236,16 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_LEGACY_SYSFS=y + +# VFIO +CONFIG_VFIO_PLATFORM=m +CONFIG_VFIO_AMBA=m +# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set + # CONFIG_CRYPTO_TEST is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_XEN is not set @@ -327,12 +340,3 @@ CONFIG_CMA_AREAS=7 # CONFIG_BMP085_SPI is not set # CONFIG_TI_DAC7512 is not set # CONFIG_SPI_ROCKCHIP is not set - -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_LEGACY_SYSFS=y - -CONFIG_VFIO_PLATFORM=m -# CONFIG_VFIO_AMBA is not set -# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set |