kernel: bump 5.15 to 5.15.56

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.15 / 950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
index 870e59a6a55477fb67198cde043c0c817cdbd6f7..b2fc4d8ffc568688bda3460ec46bc5ffadba7c04 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch
@@ -12,7 +12,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
 
 --- a/drivers/video/fbdev/core/fbmem.c
 +++ b/drivers/video/fbdev/core/fbmem.c
-@@ -25,7 +25,6 @@
+@@ -26,7 +26,6 @@
  #include <linux/init.h>
  #include <linux/linux_logo.h>
  #include <linux/proc_fs.h>
@@ -20,7 +20,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
  #include <linux/seq_file.h>
  #include <linux/console.h>
  #include <linux/kmod.h>
-@@ -1605,36 +1604,18 @@ static void do_remove_conflicting_frameb
+@@ -1606,36 +1605,18 @@ static void do_remove_conflicting_frameb
        /* check all firmware fbs and kick off if the base addr overlaps */
        for_each_registered_fb(i) {
                struct apertures_struct *gen_aper;
@@ -58,7 +58,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a.
                }
        }
  }
-@@ -1961,13 +1942,9 @@ EXPORT_SYMBOL(register_framebuffer);
+@@ -1973,13 +1954,9 @@ EXPORT_SYMBOL(register_framebuffer);
  void
  unregister_framebuffer(struct fb_info *fb_info)
  {