tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3de4f6d9 ec209291

+7 -2
+6 -1
drivers/staging/gpib/Kconfig
··· 50 50 tristate "CEC PCI board" 51 51 depends on PCI 52 52 depends on HAS_IOPORT 53 + depends on !X86_PAE 53 54 select GPIB_COMMON 54 55 select GPIB_NEC7210 55 56 help ··· 63 62 config GPIB_NI_PCI_ISA 64 63 tristate "NI PCI/ISA compatible boards" 65 64 depends on ISA_BUS || PCI || PCMCIA 65 + depends on HAS_IOPORT 66 + depends on !X86_PAE 66 67 select GPIB_COMMON 67 68 select GPIB_NEC7210 68 69 help ··· 88 85 tristate "Measurement Computing compatible boards" 89 86 depends on HAS_IOPORT 90 87 depends on ISA_BUS || PCI || PCMCIA 88 + depends on !X86_PAE 91 89 select GPIB_COMMON 92 90 select GPIB_NEC7210 93 91 help ··· 132 128 tristate "FMH FPGA based devices" 133 129 select GPIB_COMMON 134 130 select GPIB_NEC7210 135 - depends on BROKEN 131 + depends on !PPC 136 132 depends on OF && PCI 137 133 help 138 134 GPIB driver for fmhess FPGA based devices ··· 178 174 tristate "INES" 179 175 depends on PCI || ISA_BUS || PCMCIA 180 176 depends on HAS_IOPORT 177 + depends on !X86_PAE 181 178 select GPIB_COMMON 182 179 select GPIB_NEC7210 183 180 help
+1 -1
drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
··· 901 901 902 902 } else { 903 903 /* we are in the closing <DLE><ETX> sequence */ 904 - 904 + c = nc; 905 905 if (c == ETX) { 906 906 c = one_char(board, &b); 907 907 if (c == ACK) {