]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
staging: gpib: fix Makefiles
authorArnd Bergmann <arnd@arndb.de>
Thu, 12 Dec 2024 15:42:35 +0000 (16:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Dec 2024 15:43:35 +0000 (16:43 +0100)
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>
16 files changed:
drivers/staging/gpib/agilent_82350b/Makefile
drivers/staging/gpib/agilent_82357a/Makefile
drivers/staging/gpib/cb7210/Makefile
drivers/staging/gpib/cec/Makefile
drivers/staging/gpib/common/Makefile
drivers/staging/gpib/eastwood/Makefile
drivers/staging/gpib/gpio/Makefile
drivers/staging/gpib/hp_82335/Makefile
drivers/staging/gpib/hp_82341/Makefile
drivers/staging/gpib/ines/Makefile
drivers/staging/gpib/lpvo_usb_gpib/Makefile
drivers/staging/gpib/nec7210/Makefile
drivers/staging/gpib/ni_usb/Makefile
drivers/staging/gpib/pc2/Makefile
drivers/staging/gpib/tms9914/Makefile
drivers/staging/gpib/tnt4882/Makefile

index d9236c92e04be45bab3c92c34c3af9bfcf3ec32d..f24e1e713a63c7f3e3e0da96f0fee00ad65df771 100644 (file)
@@ -1,2 +1,2 @@
 
-obj-m += agilent_82350b.o
+obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b.o
index 4a1d940fce2b83508012274c9df6dad2d42844c6..81a55c257a6eeaa0b78c598a80cfa089fee6410d 100644 (file)
@@ -1,4 +1,4 @@
 
-obj-m += agilent_82357a.o
+obj-$(CONFIG_GPIB_AGILENT_82357A) += agilent_82357a.o
 
 
index 22e0214fc17dcae470d4693856007e81d631ca42..cda0725d6487ef164c797138ce62046a41bfdfc7 100644 (file)
@@ -1,4 +1,4 @@
 ccflags-$(CONFIG_GPIB_PCMCIA) := -DGPIB_PCMCIA
-obj-m += cb7210.o
+obj-$(CONFIG_GPIB_CB7210) += cb7210.o
 
 
index f4638628ff294599e223f2531943dadad0d6ee55..b7141e23d4e092b8e5ee6ba6d885a6084463b092 100644 (file)
@@ -1,3 +1,3 @@
 
-obj-m += cec_gpib.o
+obj-$(CONFIG_GPIB_CEC_PCI) += cec_gpib.o
 
index 0c4c77bea75b3e14c8c79f2210ac057f0dc93589..460586edb5741b2efcde32faf017e38f89a7893d 100644 (file)
@@ -1,5 +1,5 @@
 
-obj-m += gpib_common.o
+obj-$(CONFIG_GPIB_COMMON) += gpib_common.o
 
 gpib_common-objs := gpib_os.o iblib.o
 
index c74056f959d034b0dda4ccde6984074c130593ee..384825195f77c89b8e5ec88332b531ee0c8095d7 100644 (file)
@@ -1,3 +1,3 @@
 
-obj-m += fluke_gpib.o
+obj-$(CONFIG_GPIB_FLUKE) += fluke_gpib.o
 
index a31ded6e59245e3ccd9ff308cf6179ad3a74353e..00ea52abdda760d25207d6562d55e2775737c203 100644 (file)
@@ -1,4 +1,4 @@
 
-obj-m += gpib_bitbang.o
+obj-$(CONFIG_GPIB_GPIO) += gpib_bitbang.o
 
 
index 8b7a552e935566bfe7085bf76f49e47244a339d6..305ce44ee48affe98b356753d5004778eb3e4bd0 100644 (file)
@@ -1,4 +1,4 @@
 
-obj-m += hp82335.o
+obj-$(CONFIG_GPIB_HP82335) += hp82335.o
 
 
index 1fe7db4f8ca4733c85b10c841644fbcb0fdae5a9..21367310a17ee9428803d2b86dd9e4509e96ecf9 100644 (file)
@@ -1,2 +1,2 @@
 
-obj-m += hp_82341.o
+obj-$(CONFIG_GPIB_HP82341) += hp_82341.o
index cdcaa59a4e39c5f3c0a4bfd5f16122d6a872ef38..6b6e480fd811e9ba3d5ee44629b50f2c96e6057a 100644 (file)
@@ -1,4 +1,4 @@
 ccflags-$(CONFIG_GPIB_PCMCIA) := -DGPIB_PCMCIA
-obj-m += ines_gpib.o
+obj-$(CONFIG_GPIB_INES) += ines_gpib.o
 
 
index 137511acce63521d570d1f4a6ce798003187e5cd..360553488e6d3ecfc4d08e6800fc3ba923917017 100644 (file)
@@ -1,3 +1,3 @@
 
-obj-m += lpvo_usb_gpib.o
+obj-$(CONFIG_GPIB_LPVO) += lpvo_usb_gpib.o
 
index 8d4d90f211092d28581bdb1fd33ec05d2f72385f..64330f2e89d10e9fa521bb8ea5d036aa282a1edc 100644 (file)
@@ -1,4 +1,4 @@
 
-obj-m += nec7210.o
+obj-$(CONFIG_GPIB_NEC7210) += nec7210.o
 
 
index e22b3b21a62c6b9533d16fbad99e5f4d26c1ffad..469c5d16add3798120b749497ceab1b78a623693 100644 (file)
@@ -1,4 +1,4 @@
 
-obj-m += ni_usb_gpib.o
+obj-$(CONFIG_GPIB_NI_USB) += ni_usb_gpib.o
 
 
index 8148425e0f8760a771474c5578baf802927feba1..481ee4296e1b85af595f761f63525127bf10a34f 100644 (file)
@@ -1,5 +1,5 @@
 
-obj-m += pc2_gpib.o
+obj-$(CONFIG_GPIB_PC2) += pc2_gpib.o
 
 
 
index 81b7e3cf104c0ed5528aaa20d2155c20067de23f..4705ab07f413d11005076808418095200996a156 100644 (file)
@@ -1,5 +1,5 @@
 
-obj-m += tms9914.o
+obj-$(CONFIG_GPIB_TMS9914) += tms9914.o
 
 
 
index f767c990db7a09e0fdac2a9c12ace2dcf4bbacb7..04a4520ed3b7559a70fc13504411344931757004 100644 (file)
@@ -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