Skip to content

Commit

Permalink
staging: gpib: fix Makefiles
Browse files Browse the repository at this point in the history
Having gpib drivers built-in rather than as loadable modules causes
link failure because the drivers are never actually built:

arm-linux-gnueabi-ld: drivers/staging/gpib/fmh_gpib/fmh_gpib.o: in function `fmh_gpib_t1_delay':
fmh_gpib.c:(.text+0x3b0): undefined reference to `nec7210_t1_delay'
arm-linux-gnueabi-ld: drivers/staging/gpib/fmh_gpib/fmh_gpib.o: in function `fmh_gpib_serial_poll_status':
fmh_gpib.c:(.text+0x418): undefined reference to `nec7210_serial_poll_status'
arm-linux-gnueabi-ld: drivers/staging/gpib/fmh_gpib/fmh_gpib.o: in function `fmh_gpib_secondary_address':
fmh_gpib.c:(.text+0x57c): undefined reference to `nec7210_secondary_address'
arm-linux-gnueabi-ld: drivers/staging/gpib/fmh_gpib/fmh_gpib.o: in function `fmh_gpib_primary_address':
fmh_gpib.c:(.text+0x5ac): undefined reference to `nec7210_primary_address'

Change this to use the correct Makefile syntax, setting either obj-m or obj-y.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20241212154245.1411411-2-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Arnd Bergmann authored and Greg Kroah-Hartman committed Dec 20, 2024
1 parent d99d65a commit 79d2e19
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/gpib/agilent_82350b/Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

obj-m += agilent_82350b.o
obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b.o
2 changes: 1 addition & 1 deletion drivers/staging/gpib/agilent_82357a/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

obj-m += agilent_82357a.o
obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/cb7210/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ccflags-$(CONFIG_GPIB_PCMCIA) := -DGPIB_PCMCIA
obj-m += cb7210.o
obj-$(CONFIG_GPIB_CB7210) += cb7210.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/cec/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

obj-m += cec_gpib.o
obj-$(CONFIG_GPIB_CEC_PCI) += cec_gpib.o

2 changes: 1 addition & 1 deletion drivers/staging/gpib/common/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

obj-m += gpib_common.o
obj-$(CONFIG_GPIB_COMMON) += gpib_common.o

gpib_common-objs := gpib_os.o iblib.o

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/gpib/eastwood/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

obj-m += fluke_gpib.o
obj-$(CONFIG_GPIB_FLUKE) += fluke_gpib.o

2 changes: 1 addition & 1 deletion drivers/staging/gpib/gpio/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

obj-m += gpib_bitbang.o
obj-$(CONFIG_GPIB_GPIO) += gpib_bitbang.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/hp_82335/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

obj-m += hp82335.o
obj-$(CONFIG_GPIB_HP82335) += hp82335.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/hp_82341/Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

obj-m += hp_82341.o
obj-$(CONFIG_GPIB_HP82341) += hp_82341.o
2 changes: 1 addition & 1 deletion drivers/staging/gpib/ines/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ccflags-$(CONFIG_GPIB_PCMCIA) := -DGPIB_PCMCIA
obj-m += ines_gpib.o
obj-$(CONFIG_GPIB_INES) += ines_gpib.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/lpvo_usb_gpib/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

obj-m += lpvo_usb_gpib.o
obj-$(CONFIG_GPIB_LPVO) += lpvo_usb_gpib.o

2 changes: 1 addition & 1 deletion drivers/staging/gpib/nec7210/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

obj-m += nec7210.o
obj-$(CONFIG_GPIB_NEC7210) += nec7210.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/ni_usb/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

obj-m += ni_usb_gpib.o
obj-$(CONFIG_GPIB_NI_USB) += ni_usb_gpib.o


2 changes: 1 addition & 1 deletion drivers/staging/gpib/pc2/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

obj-m += pc2_gpib.o
obj-$(CONFIG_GPIB_PC2) += pc2_gpib.o



2 changes: 1 addition & 1 deletion drivers/staging/gpib/tms9914/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

obj-m += tms9914.o
obj-$(CONFIG_GPIB_TMS9914) += tms9914.o



Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/gpib/tnt4882/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ccflags-$(CONFIG_GPIB_PCMCIA) := -DGPIB_PCMCIA
obj-m += tnt4882.o
obj-$(CONFIG_GPIB_TNT4882) += tnt4882.o

tnt4882-objs := tnt4882_gpib.o mite.o

Expand Down

0 comments on commit 79d2e19

Please sign in to comment.