diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-12 12:33:44 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-12 12:33:44 +0200 |
commit | 5e90f0d270101334c2ba88739385f88875e3a915 (patch) | |
tree | 64a4611de5e38872a888caffe60e9a4efc746392 /kernel-armv7hl-debug-fedora.config | |
parent | a80f60bef2408175023e39e750fa9a2e8087fa8e (diff) | |
parent | 7af5faffc0ca5bd02bd0f7f57fb4a015e161f5a4 (diff) | |
download | kernel-5e90f0d270101334c2ba88739385f88875e3a915.tar.gz kernel-5e90f0d270101334c2ba88739385f88875e3a915.tar.xz kernel-5e90f0d270101334c2ba88739385f88875e3a915.zip |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-armv7hl-debug-fedora.config')
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 4a8e4d47f..bc692440d 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -728,6 +728,7 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -5868,6 +5869,7 @@ CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_EFUSE=m +CONFIG_ROCKCHIP_GRF=y CONFIG_ROCKCHIP_INNO_HDMI=y CONFIG_ROCKCHIP_IODOMAIN=m CONFIG_ROCKCHIP_IOMMU=y |