Commit 3de4f6d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver fixes from Greg KH:
 "Here are some small staging gpib driver build and bugfixes for issues
  that have been much-reported (should finally fix Guenter's build
  issues). There are more of these coming in later -rc releases, but for
  now this should fix the majority of the reported problems.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: gpib: Fix i386 build issue
  staging: gpib: Fix faulty workaround for assignment in if
  staging: gpib: Workaround for ppc build failure
  staging: gpib: Make GPIB_NI_PCI_ISA depend on HAS_IOPORT
parents ec209291 48e8a816

drivers/staging/gpib/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config GPIB_CEC_PCI 
	tristate "CEC PCI board"

	depends on PCI

	depends on HAS_IOPORT

	depends on !X86_PAE

	select GPIB_COMMON

	select GPIB_NEC7210

	help
@@ -62,6 +63,8 @@ config GPIB_CEC_PCI 
config GPIB_NI_PCI_ISA

	tristate "NI PCI/ISA compatible boards"

	depends on ISA_BUS || PCI || PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

	select GPIB_COMMON

	select GPIB_NEC7210

	help
@@ -85,6 +88,7 @@ config GPIB_CB7210 
       tristate "Measurement Computing compatible boards"

	depends on HAS_IOPORT

	depends on ISA_BUS || PCI || PCMCIA

	depends on !X86_PAE

       select GPIB_COMMON

	select GPIB_NEC7210

       help
@@ -128,7 +132,7 @@ config GPIB_FMH 
       tristate "FMH FPGA based devices"

       select GPIB_COMMON

       select GPIB_NEC7210

       depends on BROKEN

       depends on !PPC

       depends on OF && PCI

       help

         GPIB driver for fmhess FPGA based devices
@@ -174,6 +178,7 @@ config GPIB_INES 
       tristate "INES"

	depends on PCI || ISA_BUS || PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

       select GPIB_COMMON

       select GPIB_NEC7210

       help

drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int usb_gpib_read(gpib_board_t *board, 


		} else {

			/* we are in the closing <DLE><ETX> sequence */



			c = nc;

			if (c == ETX) {

				c = one_char(board, &b);

				if (c == ACK) {