[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: x86: 6.6: Activate CONFIG_FB_DEVICE kernel: Add CONFIG_FB_DEVICE to kmod-fb
xiaohong001 · May 31, 2024 · b28280a · b28280a
2 parents b152497 + 9042bd0
commit b28280a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
@@ -79,6 +79,7 @@ define KernelPackage/fb
   DEPENDS:=@DISPLAY_SUPPORT
   KCONFIG:= \
 	CONFIG_FB \
+	CONFIG_FB_DEVICE=y \
 	CONFIG_FB_MXS=n \
 	CONFIG_FB_SM750=n \
 	CONFIG_FRAMEBUFFER_CONSOLE=y \

diff --git a/target/linux/x86/64/config-6.6 b/target/linux/x86/64/config-6.6
@@ -175,6 +175,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_DEVICE=y
 CONFIG_FB_EFI=y
 CONFIG_FB_HYPERV=y
 # CONFIG_FB_INTEL is not set

diff --git a/target/linux/x86/generic/config-6.6 b/target/linux/x86/generic/config-6.6
@@ -136,6 +136,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_DEVICE=y
 CONFIG_FB_EFI=y
 CONFIG_FB_HYPERV=y
 # CONFIG_FB_I810 is not set

diff --git a/target/linux/x86/legacy/config-6.6 b/target/linux/x86/legacy/config-6.6
@@ -98,6 +98,7 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_DEVICE=y
 # CONFIG_FB_I810 is not set
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y