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.

[PATCH] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module

LD drivers/isdn/gigaset/built-in.o
drivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition of `gigaset_m10x_send_skb'
drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here
drivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input'
drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here
make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Adrian Bunk and committed by
Linus Torvalds d5c1682f da68d61f

+5 -3
+3 -3
drivers/isdn/gigaset/Makefile
··· 1 - gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o 2 - usb_gigaset-y := usb-gigaset.o asyncdata.o 1 + gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o asyncdata.o 2 + usb_gigaset-y := usb-gigaset.o 3 3 bas_gigaset-y := bas-gigaset.o isocdata.o 4 - ser_gigaset-y := ser-gigaset.o asyncdata.o 4 + ser_gigaset-y := ser-gigaset.o 5 5 6 6 obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o 7 7 obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
+2
drivers/isdn/gigaset/asyncdata.c
··· 444 444 atomic_set(&inbuf->head, head); 445 445 } 446 446 } 447 + EXPORT_SYMBOL_GPL(gigaset_m10x_input); 447 448 448 449 449 450 /* == data output ========================================================== */ ··· 592 591 593 592 return len; /* ok so far */ 594 593 } 594 + EXPORT_SYMBOL_GPL(gigaset_m10x_send_skb);