Commit dae9f8e6 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

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



a) Remove #define acrobatics that have become unnecessary by the move of
   asyncdata.o into the common part.

b) Correct the rule for building the common part into the kernel when
   some or all hardware specific parts are built as modules.

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: Adrian Bunk <bunk@stusta.de>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 65dc8145

drivers/isdn/gigaset/Makefile

+5 −4
Original line number Diff line number Diff line 
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

bas_gigaset-y := bas-gigaset.o isocdata.o



obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o

obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o

obj-$(CONFIG_GIGASET_M101) += ser_gigaset.o gigaset.o
 
obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset.o

obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o

obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o

obj-$(CONFIG_GIGASET_M101) += ser_gigaset.o

drivers/isdn/gigaset/asyncdata.c

+0 −5
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
 * =====================================================================

 */



/* not set by Kbuild when building both ser_gigaset and usb_gigaset */

#ifndef KBUILD_MODNAME

#define KBUILD_MODNAME "asy_gigaset"

#endif



#include "gigaset.h"

#include <linux/crc-ccitt.h>

#include <linux/bitrev.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE