Commit e6ab5046 authored by Dave Penkler's avatar Dave Penkler Committed by Greg Kroah-Hartman
Browse files

staging: gpib: Destage gpib



Move the gpib drivers out of staging and into the "real" part of the
kernel.  This entails:

 - Remove the gpib Kconfig menu and Makefile build rule from staging.
 - Remove gpib/uapi from the header file search path in subdir-ccflags
   of the gpib Makefile
 - move the gpib/uapi files to include/uapi/linux
 - Move the gpib tree out of staging to drivers.
 - Remove the word "Linux" from the gpib Kconfig file.
 - Add the gpib Kconfig menu and Makefile build rule to drivers

Signed-off-by: default avatarDave Penkler <dpenkler@gmail.com>
Link: https://patch.msgid.link/20251117144021.23569-5-dpenkler@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a64ff10c
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -10628,7 +10628,9 @@ F: drivers/platform/x86/gpd-pocket-fan.c
GPIB DRIVERS
M:	Dave Penkler <dpenkler@gmail.com>
S:	Maintained
F:	drivers/staging/gpib/
F:	drivers/gpib/
F:	include/uapi/linux/gpib.h
F:	include/uapi/linux/gpib_ioctl.h
GPIO ACPI SUPPORT
M:	Mika Westerberg <westeri@kernel.org>
+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig"

source "drivers/comedi/Kconfig"

source "drivers/gpib/Kconfig"

source "drivers/staging/Kconfig"

source "drivers/platform/Kconfig"
+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/
obj-$(CONFIG_VHOST)		+= vhost/
obj-$(CONFIG_GREYBUS)		+= greybus/
obj-$(CONFIG_COMEDI)		+= comedi/
obj-$(CONFIG_GPIB)		+= gpib/
obj-$(CONFIG_STAGING)		+= staging/
obj-y				+= platform/

+4 −4
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
menuconfig GPIB
	tristate "Linux GPIB drivers"
	tristate "GPIB drivers"
	help
	  Enable support for GPIB cards and dongles for Linux.  GPIB
	  is the General Purpose Interface Bus which conforms to the
	  IEEE488 standard.
	  Enable support for GPIB cards and dongles.  GPIB is the
	  General Purpose Interface Bus which conforms to the IEEE488
	  standard.

	  This set of drivers can be used with the corresponding user
	  space library that can be found on Sourceforge under linux-gpib.
+1 −1
Original line number Diff line number Diff line

subdir-ccflags-y += -I$(src)/include -I$(src)/uapi
subdir-ccflags-y += -I$(src)/include

obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/
obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a/
Loading