From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 13 Jan 2025 05:42:54 +0000 (+0100)
Subject: Merge 6.13-rc7 into staging next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b37333c8657cfece16b2fb0ba3fef2cb481a0a19;p=users%2Fdwmw2%2Flinux.git

Merge 6.13-rc7 into staging next

We need the gpib changes in here as well to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

b37333c8657cfece16b2fb0ba3fef2cb481a0a19
diff --cc drivers/staging/gpib/include/gpibP.h
index d0cd42c1a0ad6,b97da577ba332..d35fdd391f7e1
--- a/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/staging/gpib/include/gpibP.h
@@@ -16,8 -16,9 +16,9 @@@
  
  #include <linux/fs.h>
  #include <linux/interrupt.h>
+ #include <linux/io.h>
  
 -void gpib_register_driver(gpib_interface_t *interface, struct module *mod);
 +int gpib_register_driver(gpib_interface_t *interface, struct module *mod);
  void gpib_unregister_driver(gpib_interface_t *interface);
  struct pci_dev *gpib_pci_get_device(const gpib_board_config_t *config, unsigned int vendor_id,
  				    unsigned int device_id, struct pci_dev *from);