diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-12 08:21:08 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-11-12 08:21:08 +0100 |
| commit | bd450969a3ce9072ee0d05efcb7b9ff9514c4655 (patch) | |
| tree | 29eab38173265508fb7f644c7b56006eda118e7a /kernel-armv7hl-debug.config | |
| parent | 9effb9ad661146c726cc081dec85bd2900d4be33 (diff) | |
| parent | 670d3710ce2f8826be647dd71bcbc00d020abb4c (diff) | |
| download | kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc29.tar.gz kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc29.tar.xz kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc29.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc30kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.20.0-0.rc2.git0.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-armv7hl-debug.config')
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 357ce391b..53c03b295 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2348,6 +2348,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y # CONFIG_I2C_PARPORT_LIGHT is not set @@ -6723,6 +6724,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set |