[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: Tilman Schmidt <tilman@imap.cc> Cc: Adrian Bunk <bunk@stusta.de> Cc: Karsten Keil <kkeil@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
65dc814571
commit
dae9f8e63c
|
@ -1,8 +1,9 @@
|
|||
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
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue