diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-18 07:43:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-18 07:43:43 +0200 |
| commit | 01d75ec90e94f7864bdf3666f803724efa6d518a (patch) | |
| tree | c0e01c491aabc9d94e560c2da879e0a6b1a12358 /kernel-armv7hl-lpae-debug.config | |
| parent | fc85d46525b4cdd92941f33d199ef5640273261b (diff) | |
| parent | 2753dad8da07e676c4b0f86d2376831e6d3c7753 (diff) | |
| download | kernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc27.tar.gz kernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc27.tar.xz kernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc27.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 8600d6131..53d1c59a0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -734,7 +734,7 @@ CONFIG_CACHEFILES=m CONFIG_CACHE_L2X0_PMU=y CONFIG_CACHE_L2X0=y CONFIG_CACHE_TAUROS2=y -# CONFIG_CADENCE_WATCHDOG is not set +CONFIG_CADENCE_WATCHDOG=m # CONFIG_CAIF is not set CONFIG_CAN_8DEV_USB=m CONFIG_CAN_BCM=m @@ -2110,7 +2110,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m # CONFIG_I2C_BCM2048 is not set CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_CADENCE is not set +CONFIG_I2C_CADENCE=m # CONFIG_I2C_CBUS_GPIO is not set CONFIG_I2C_CHARDEV=m CONFIG_I2C_COMPAT=y @@ -5669,7 +5669,7 @@ CONFIG_SPI_BCM2835=m # CONFIG_SPI_BCM_QSPI is not set CONFIG_SPI_BITBANG=m # CONFIG_SPI_BUTTERFLY is not set -# CONFIG_SPI_CADENCE is not set +CONFIG_SPI_CADENCE=m # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_DAVINCI=m # CONFIG_SPI_DEBUG is not set @@ -5872,12 +5872,11 @@ CONFIG_TEGRA124_EMC=y CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA20_MC is not set CONFIG_TEGRA_AHB=y -# CONFIG_TEGRA_BPMP_THERMAL is not set -CONFIG_TEGRA_BPMP=y +# CONFIG_TEGRA_BPMP is not set CONFIG_TEGRA_GMI=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_TEGRA_HOST1X=m -CONFIG_TEGRA_HSP_MBOX=y +# CONFIG_TEGRA_HSP_MBOX is not set # CONFIG_TEGRA_IOMMU_GART is not set CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_TEGRA_IVC=y |