Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d5c1682f9f8f4aa064f81fda67ea7b91fd829512
Commit:     d5c1682f9f8f4aa064f81fda67ea7b91fd829512
Parent:     da68d61f89e275260cc993a0d4a39e63700098fb
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 20 13:58:17 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Feb 20 17:10:16 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Cc: Tilman Schmidt <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/isdn/gigaset/Makefile    |    6 +++---
 drivers/isdn/gigaset/asyncdata.c |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/gigaset/Makefile b/drivers/isdn/gigaset/Makefile
index 077e297..5158be0 100644
--- a/drivers/isdn/gigaset/Makefile
+++ b/drivers/isdn/gigaset/Makefile
@@ -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
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index ddf5e92..f2f108f 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -444,6 +444,7 @@ nextbyte:
                atomic_set(&inbuf->head, head);
        }
 }
+EXPORT_SYMBOL_GPL(gigaset_m10x_input);
 
 
 /* == data output ========================================================== */
@@ -591,3 +592,4 @@ int gigaset_m10x_send_skb(struct bc_state *bcs, struct 
sk_buff *skb)
 
        return len;     /* ok so far */
 }
+EXPORT_SYMBOL_GPL(gigaset_m10x_send_skb);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to