From: Adrian Bunk <bunk@stusta.de>
To: Tilman Schmidt <tilman@imap.cc>, Hansjoerg Lipp <hjlipp@web.de>
Cc: gigaset307x-common@lists.sourceforge.net, kkeil@suse.de,
kai.germaschewski@gmx.de, isdn4linux@listserv.isdn4linux.de,
linux-kernel@vger.kernel.org
Subject: [2.6 patch] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module
Date: Thu, 15 Feb 2007 22:56:38 +0100 [thread overview]
Message-ID: <20070215215638.GI13958@stusta.de> (raw)
This patch fixes the following compile error:
<-- snip -->
...
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
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/isdn/gigaset/Makefile | 6 +++---
drivers/isdn/gigaset/asyncdata.c | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
--- linux-2.6.20-mm1/drivers/isdn/gigaset/Makefile.old 2007-02-15 19:35:30.000000000 +0100
+++ linux-2.6.20-mm1/drivers/isdn/gigaset/Makefile 2007-02-15 19:35:46.000000000 +0100
@@ -1,7 +1,7 @@
-gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o
-usb_gigaset-y := usb-gigaset.o asyncdata.o
+gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o asyncdata.o
+usb_gigaset-y := usb-gigaset.o
bas_gigaset-y := bas-gigaset.o isocdata.o
-ser_gigaset-y := ser-gigaset.o asyncdata.o
+ser_gigaset-y := ser-gigaset.o
obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o
obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
--- linux-2.6.20-mm1/drivers/isdn/gigaset/asyncdata.c.old 2007-02-15 19:36:14.000000000 +0100
+++ linux-2.6.20-mm1/drivers/isdn/gigaset/asyncdata.c 2007-02-15 19:37:08.000000000 +0100
@@ -444,6 +444,7 @@
atomic_set(&inbuf->head, head);
}
}
+EXPORT_SYMBOL_GPL(gigaset_m10x_input);
/* == data output ========================================================== */
@@ -591,3 +592,4 @@
return len; /* ok so far */
}
+EXPORT_SYMBOL_GPL(gigaset_m10x_send_skb);
next reply other threads:[~2007-02-15 21:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-15 21:56 Adrian Bunk [this message]
2007-02-16 0:17 ` [2.6 patch] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module Tilman Schmidt
2007-02-16 8:33 ` Adrian Bunk
2007-02-17 0:04 ` Kbuild problem (was: [2.6 patch] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module) Tilman Schmidt
2007-02-17 10:52 ` Adrian Bunk
2007-02-17 18:36 ` Kbuild problem Tilman Schmidt
2007-02-18 5:22 ` Kai Germaschewski
2007-02-18 10:40 ` Adrian Bunk
2007-02-20 13:56 ` Tilman Schmidt
2007-02-20 14:12 ` Joerg Dorchain
2007-02-20 14:59 ` Adrian Bunk
2007-02-20 21:55 ` Tilman Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070215215638.GI13958@stusta.de \
--to=bunk@stusta.de \
--cc=gigaset307x-common@lists.sourceforge.net \
--cc=hjlipp@web.de \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=kai.germaschewski@gmx.de \
--cc=kkeil@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tilman@imap.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.