diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-06-29 11:24:25 -0400 |
commit | 76c11d9b55366c6da11ee821716d56b68110a2c6 (patch) | |
tree | b7eae841919f78db12d303d20863564b05bf3f33 /config-arm-generic | |
parent | c9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff) | |
download | kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip |
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
Diffstat (limited to 'config-arm-generic')
-rw-r--r-- | config-arm-generic | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic index 740a53d9e..d884c8694 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -47,6 +47,7 @@ CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_CCI=y CONFIG_ARM_CCN=y CONFIG_ARM_CCI400_PMU=y +CONFIG_ARM_CCI500_PMU=y CONFIG_ARM_DMA_USE_IOMMU=y CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_ARM_GIC=y @@ -152,6 +153,7 @@ CONFIG_USB_DWC3=m CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_PCI=m # CONFIG_USB_DWC3_DEBUG is not set +CONFIG_USB_DWC3_ULPI=y CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y # CONFIG_MMC_DW_EXYNOS is not set @@ -330,3 +332,7 @@ CONFIG_CMA_AREAS=7 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 |