Skip to content

Commit e6ab504

Browse files
dpenklergregkh
authored andcommitted
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: Dave Penkler <dpenkler@gmail.com> Link: https://patch.msgid.link/20251117144021.23569-5-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a64ff10 commit e6ab504

73 files changed

Lines changed: 14 additions & 12 deletions

Some content is hidden

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

MAINTAINERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10628,7 +10628,9 @@ F: drivers/platform/x86/gpd-pocket-fan.c
1062810628
GPIB DRIVERS
1062910629
M: Dave Penkler <dpenkler@gmail.com>
1063010630
S: Maintained
10631-
F: drivers/staging/gpib/
10631+
F: drivers/gpib/
10632+
F: include/uapi/linux/gpib.h
10633+
F: include/uapi/linux/gpib_ioctl.h
1063210634

1063310635
GPIO ACPI SUPPORT
1063410636
M: Mika Westerberg <westeri@kernel.org>

drivers/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ source "drivers/greybus/Kconfig"
161161

162162
source "drivers/comedi/Kconfig"
163163

164+
source "drivers/gpib/Kconfig"
165+
164166
source "drivers/staging/Kconfig"
165167

166168
source "drivers/platform/Kconfig"

drivers/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ obj-$(CONFIG_VHOST_IOTLB) += vhost/
150150
obj-$(CONFIG_VHOST) += vhost/
151151
obj-$(CONFIG_GREYBUS) += greybus/
152152
obj-$(CONFIG_COMEDI) += comedi/
153+
obj-$(CONFIG_GPIB) += gpib/
153154
obj-$(CONFIG_STAGING) += staging/
154155
obj-y += platform/
155156

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0
22
menuconfig GPIB
3-
tristate "Linux GPIB drivers"
3+
tristate "GPIB drivers"
44
help
5-
Enable support for GPIB cards and dongles for Linux. GPIB
6-
is the General Purpose Interface Bus which conforms to the
7-
IEEE488 standard.
5+
Enable support for GPIB cards and dongles. GPIB is the
6+
General Purpose Interface Bus which conforms to the IEEE488
7+
standard.
88

99
This set of drivers can be used with the corresponding user
1010
space library that can be found on Sourceforge under linux-gpib.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

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

44
obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/
55
obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)