diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-29 07:34:45 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-29 07:34:45 +0100 |
| commit | e9a064f5d48dbe8c6e779507a5d0270ffdfe8161 (patch) | |
| tree | 95e7f0bccc57007ba87775dc9dfa3e1bf0ddddae /config-arm-generic | |
| parent | 5f1b93ee30c89a1f9f3394444462584f4f84761c (diff) | |
| parent | 4a651d61dae250efb3bc5281715525bb3731e274 (diff) | |
| download | kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23.tar.gz kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23.tar.xz kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc7.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/config-arm-generic b/config-arm-generic index f52f5347e..5a322f8b0 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -66,9 +66,10 @@ CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_ARM_SMMU=y CONFIG_MMC_ARMMMCI=y +CONFIG_COMMON_CLK_SCPI=m CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIO_AMBAKMI=y +CONFIG_SERIO_AMBAKMI=m CONFIG_FB_ARMCLCD=y CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=m @@ -89,11 +90,6 @@ CONFIG_CRYPTO_SHA1_ARM_NEON=y CONFIG_CRYPTO_SHA512_ARM=y CONFIG_TCG_TIS_I2C_ATMEL=m -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=m -CONFIG_EDAC_LEGACY_SYSFS=y - # Regulators CONFIG_REGULATOR=y CONFIG_RFKILL_REGULATOR=m @@ -396,7 +392,6 @@ CONFIG_USB_MUSB_DUAL_ROLE=y CONFIG_USB_MUSB_DSPS=m # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_MUSB_TUSB6010 is not set -# CONFIG_USB_MUSB_UX500 is not set CONFIG_USB_GPIO_VBUS=m CONFIG_USB_CONFIGFS=m CONFIG_USB_CONFIGFS_ACM=y @@ -581,13 +576,8 @@ 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 -# CONFIG_DRM_RCAR_DU is not set -# CONFIG_I2C_RCAR is not set -# CONFIG_DRM_SHMOBILE is not set -# CONFIG_I2C_SH_MOBILE is not set # CONFIG_I2C_NOMADIK is not set # CONFIG_IRQ_DOMAIN_DEBUG is not set # CONFIG_LOCK_STAT is not set @@ -597,13 +587,10 @@ CONFIG_VFIO_AMBA=m # CONFIG_DRM_ARMADA is not set # CONFIG_COMMON_CLK_SI570 is not set -# CONFIG_COMMON_CLK_QCOM is not set -CONFIG_COMMON_CLK_SCPI=m # CONFIG_ARM_PTDUMP is not set # CONFIG_PATA_PLATFORM is not set -# CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_OMAP_GPMC_DEBUG is not set |