The patch titled
drivers/isdn/gigaset: build asyncdata.o into the gigaset module (fix)
has been removed from the -mm tree. Its filename was
drivers-isdn-gigaset-build-asyncdatao-into-the-gigaset-module-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers/isdn/gigaset: build asyncdata.o into the gigaset module (fix)
From: Tilman Schmidt <tilman@xxxxxxx>
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@xxxxxxx>
Cc: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/isdn/gigaset/Makefile | 9 +++++----
drivers/isdn/gigaset/asyncdata.c | 5 -----
2 files changed, 5 insertions(+), 9 deletions(-)
diff -puN drivers/isdn/gigaset/Makefile~drivers-isdn-gigaset-build-asyncdatao-into-the-gigaset-module-fix drivers/isdn/gigaset/Makefile
--- a/drivers/isdn/gigaset/Makefile~drivers-isdn-gigaset-build-asyncdatao-into-the-gigaset-module-fix
+++ a/drivers/isdn/gigaset/Makefile
@@ -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
diff -puN drivers/isdn/gigaset/asyncdata.c~drivers-isdn-gigaset-build-asyncdatao-into-the-gigaset-module-fix drivers/isdn/gigaset/asyncdata.c
--- a/drivers/isdn/gigaset/asyncdata.c~drivers-isdn-gigaset-build-asyncdatao-into-the-gigaset-module-fix
+++ a/drivers/isdn/gigaset/asyncdata.c
@@ -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>
_
Patches currently in -mm which might be from tilman@xxxxxxx are
origin.patch
drivers-isdn-gigaset-mark-some-static-data-as-const-v2.patch
fsaio-enable-wait-bit-based-filtered-wakeups-to-work-for-aio-fix-sparse-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
