Skip to content

Commit 2575798

Browse files
committed
Merge tag 'staging-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the big set of staging driver cleanups and updates for 6.15-rc1. As expected, with the introduction of the gpib drivers, loads of cleanups and fixes showed up, with the huge majority of changes being for that chunk of drivers. This is good and shows that the community can fix up things in public when asked to. Also included in here are: - small sm750fb cleanups - tiny rtl8723bs cleanups - more vchiq_arm cleanups and changes, hopefully this will get out of staging soon All of these have been in linux-next for almost 2 weeks now with no reported issues" * tag 'staging-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (76 commits) staging: rtl8723bs: fixed a unnecessary parentheses coding style issue staging: vchiq_arm: Improve initial VCHIQ connect staging: vchiq_arm: Create keep-alive thread during probe staging: vchiq_arm: Stop kthreads if vchiq cdev register fails staging: vchiq_arm: Fix possible NPR of keep-alive thread staging: vchiq_arm: Register debugfs after cdev staging: vchiq_arm: Don't use %pK through printk staging: rtl8723bs: select CONFIG_CRYPTO_LIB_AES staging: rtl8723bs: Remove some unused functions, macros, and structs staging: gpib: change return type of t1_delay function to report errors staging: gpib: remove commented-out lines staging: gpib: fix kernel-doc section for usb_gpib_line_status() function staging: gpib: fix kernel-doc section for function usb_gpib_interface_clear() staging: gpib: fix kernel-doc section for write_loop() function staging: gpib: Removing typedef for gpib_board staging: gpib: struct typing for gpib_gboard_t staging: gpib: tnt4882: struct gpib_board staging: gpib: tms9914: struct gpib_board staging: gpib: pc2: struct gpib_board staging: gpib: ni_usb_gpib: struct gpib_board ...
2 parents a0935e4 + 3b23d31 commit 2575798

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2757
-3956
lines changed

drivers/pnp/isapnp/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,7 @@ EXPORT_SYMBOL(isapnp_protocol);
843843
EXPORT_SYMBOL(isapnp_present);
844844
EXPORT_SYMBOL(isapnp_cfg_begin);
845845
EXPORT_SYMBOL(isapnp_cfg_end);
846+
EXPORT_SYMBOL(isapnp_read_byte);
846847
EXPORT_SYMBOL(isapnp_write_byte);
847848

848849
static int isapnp_get_resources(struct pnp_dev *dev)

drivers/staging/gpib/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ config GPIB_CEC_PCI
5050
tristate "CEC PCI board"
5151
depends on PCI
5252
depends on HAS_IOPORT
53-
depends on !X86_PAE
5453
select GPIB_COMMON
5554
select GPIB_NEC7210
5655
help
@@ -64,7 +63,6 @@ config GPIB_NI_PCI_ISA
6463
tristate "NI PCI/ISA compatible boards"
6564
depends on ISA_BUS || PCI || PCMCIA
6665
depends on HAS_IOPORT
67-
depends on !X86_PAE
6866
depends on PCMCIA || !PCMCIA
6967
depends on HAS_IOPORT_MAP
7068
select GPIB_COMMON
@@ -90,7 +88,6 @@ config GPIB_CB7210
9088
tristate "Measurement Computing compatible boards"
9189
depends on HAS_IOPORT
9290
depends on ISA_BUS || PCI || PCMCIA
93-
depends on !X86_PAE
9491
depends on PCMCIA || !PCMCIA
9592
select GPIB_COMMON
9693
select GPIB_NEC7210
@@ -169,7 +166,6 @@ config GPIB_HP82341
169166
tristate "HP82341x"
170167
select GPIB_COMMON
171168
select GPIB_TMS9914
172-
depends on BROKEN
173169
depends on ISA_BUS || EISA
174170
help
175171
GPIB driver for HP82341 A/B/C/D boards
@@ -182,7 +178,6 @@ config GPIB_INES
182178
depends on PCI || ISA_BUS || PCMCIA
183179
depends on PCMCIA || !PCMCIA
184180
depends on HAS_IOPORT
185-
depends on !X86_PAE
186181
select GPIB_COMMON
187182
select GPIB_NEC7210
188183
help

0 commit comments

Comments
 (0)