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 <[email protected]>
---
This patch applies to 2.6.20-rc1. It is the delta between Adrian Bunk's
[PATCH] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module
which has already been merged, and my
[PATCH] drivers/isdn/gigaset: build asyncdata.o into the gigaset module (v2)
which came too late to replace it. Please merge.
Makefile | 9 +++++----
asyncdata.c | 5 -----
2 files changed, 5 insertions(+), 9 deletions(-)
diff -purX linux-2.6.20-work/Documentation/dontdiff linux-2.6.21-rc1-orig/drivers/isdn/gigaset/asyncdata.c linux-2.6.21-rc1-work/drivers/isdn/gigaset/asyncdata.c
--- linux-2.6.21-rc1-orig/drivers/isdn/gigaset/asyncdata.c 2007-02-22 23:15:53.000000000 +0100
+++ linux-2.6.21-rc1-work/drivers/isdn/gigaset/asyncdata.c 2007-02-21 13:27:40.000000000 +0100
@@ -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>
diff -purX linux-2.6.20-work/Documentation/dontdiff linux-2.6.21-rc1-orig/drivers/isdn/gigaset/Makefile linux-2.6.21-rc1-work/drivers/isdn/gigaset/Makefile
--- linux-2.6.21-rc1-orig/drivers/isdn/gigaset/Makefile 2007-02-22 23:15:53.000000000 +0100
+++ linux-2.6.21-rc1-work/drivers/isdn/gigaset/Makefile 2007-02-21 13:25:47.000000000 +0100
@@ -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