ISDN: Make capiutil.o integral part of kernelcapi.o

No need for it being a standalone module.

diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile
index 745e8f491c83fc09c441c9d83fa1246039b28335..6534e419c1b1bf302c849681dc0a5de660e1cd17 100644 (file)
--- a/drivers/isdn/capi/Makefile
+++ b/drivers/isdn/capi/Makefile
@@ -10,13 +10,13 @@ export-objs := kcapi.o capiutil.o capifs.o
 
 # Multipart objects.
 
-kernelcapi-objs        := kcapi.o
+kernelcapi-objs        := kcapi.o capiutil.o
 
 # Ordering constraints: kernelcapi.o first
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_ISDN_CAPI)                        += kernelcapi.o capiutil.o
+obj-$(CONFIG_ISDN_CAPI)                        += kernelcapi.o
 obj-$(CONFIG_ISDN_CAPI_CAPI20)         += capi.o 
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)                += capidrv.o
 obj-$(CONFIG_ISDN_CAPI_CAPIFS)         += capifs.o

diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index bd0636ec9a08cd964b48f6e0deab17a33f731863..c26dec646a8760522f5d3c0d836659afe6f39eb8 100644 (file)
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -20,10 +20,6 @@
 #include <linux/config.h>
 #include <linux/isdn/capiutil.h>
 
-MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support");
-MODULE_AUTHOR("Carsten Paeth");
-MODULE_LICENSE("GPL");
-
 /* from CAPI2.0 DDK AVM Berlin GmbH */
 
 #ifndef CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
@@ -923,15 +919,3 @@ EXPORT_SYMBOL(capi_cmd2str);
 EXPORT_SYMBOL(capi_cmsg2str);
 EXPORT_SYMBOL(capi_message2str);
 EXPORT_SYMBOL(capi_info2str);
-
-static int __init capiutil_init(void)
-{ 
-       return 0; 
-}
-
-static void __exit capiutil_exit(void)
-{
-}
-
-module_init(capiutil_init);
-module_exit(capiutil_exit);