diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-17 20:26:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-17 20:26:48 +0200 |
| commit | b93fc1d2a6f6f5fe6127bf40979117ddc333d504 (patch) | |
| tree | 6b9f8cd036eccb409a4ed7a63c238ba965829c7e /kernel-armv7hl.config | |
| parent | 322556ccde90965b4319c349a4bad7810adb3a08 (diff) | |
| parent | 3986999a48a7b1279e3b1e407f7aad00b337a3ad (diff) | |
| download | kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.tar.gz kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.tar.xz kernel-b93fc1d2a6f6f5fe6127bf40979117ddc333d504.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc1.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 473e88371..43ca8c143 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -932,7 +932,7 @@ CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set CONFIG_COMMON_CLK_SI5351=m -CONFIG_COMMON_CLK_SI570=m +# CONFIG_COMMON_CLK_SI570 is not set CONFIG_COMMON_CLK_TI_ADPLL=m # CONFIG_COMMON_CLK_VC5 is not set CONFIG_COMMON_CLK_VERSATILE=y @@ -1311,7 +1311,7 @@ CONFIG_DRM_CIRRUS_QEMU=m # CONFIG_DRM_DEBUG_MM_SELFTEST is not set CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DUMB_VGA_DAC=m -# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_I2S_AUDIO=m CONFIG_DRM_DW_HDMI=m CONFIG_DRM_ETNAVIV=m @@ -4030,6 +4030,7 @@ CONFIG_NR_CPUS=32 CONFIG_NR_DEV_DAX=32768 CONFIG_NS83820=m CONFIG_NSC_FIR=m +CONFIG_NTB_IDT=m # CONFIG_NTB is not set # CONFIG_NTFS_FS is not set CONFIG_NTP_PPS=y @@ -4866,7 +4867,7 @@ CONFIG_RTC_DRV_TEGRA=m CONFIG_RTC_DRV_TPS6586X=m CONFIG_RTC_DRV_TPS65910=m CONFIG_RTC_DRV_TPS80031=m -CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_TWL4030=m # CONFIG_RTC_DRV_TWL92330 is not set CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_WM831X=m @@ -6043,6 +6044,7 @@ CONFIG_TEST_ASYNC_DRIVER_PROBE=m # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_KMOD is not set CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set @@ -6907,6 +6909,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m # CONFIG_WAFER_WDT is not set # CONFIG_WAN is not set +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y # CONFIG_WATCHDOG_NOWAYOUT is not set |