From 002d7d90501db71a4af235569350b2fcb5581a85 Mon Sep 17 00:00:00 2001
From: Karsten Keil <keil@temic-ech.spacenet.de>
Date: Mon, 28 Jul 2003 12:41:46 +0000
Subject: [PATCH] make changes for 2.5/2.6

---
 add.config                              |   9 +-
 drivers/isdn/hardware/mISDN/Kconfig     |  37 +++++++
 drivers/isdn/hardware/mISDN/Makefile    | 122 ++++++------------------
 drivers/isdn/hardware/mISDN/Rules.mISDN |  63 ++++++++++++
 km_mISDN.spec                           |   2 +-
 5 files changed, 136 insertions(+), 97 deletions(-)
 create mode 100644 drivers/isdn/hardware/mISDN/Kconfig
 create mode 100755 drivers/isdn/hardware/mISDN/Rules.mISDN

diff --git a/add.config b/add.config
index a5e35eb..a6d4493 100644
--- a/add.config
+++ b/add.config
@@ -1,3 +1,8 @@
-# new mISDN driver as module
-CONFIG_ISDN_DRV_mISDN=m
+#
+# Modular ISDN driver
+#
+CONFIG_MISDN_DRV=m
+CONFIG_MISDN_AVM_FRITZ=y
+CONFIG_MISDN_HFCPCI=y
+CONFIG_MISDN_SPEEDFAX=y
 
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
new file mode 100644
index 0000000..93bc1ec
--- /dev/null
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -0,0 +1,37 @@
+#
+# modularer ISDN driver
+#
+
+menu "Modular ISDN driver"
+	depends on NET && ISDN_BOOL && ISDN_CAPI!=n
+
+config MISDN_DRV
+	tristate "Support modular ISDN driver"
+	help
+	  Enable support for the modular ISDN driver.
+          This driver is the successor of the famous HiSax driver.
+
+if MISDN_DRV!=n
+
+config MISDN_AVM_FRITZ
+	bool "Support for AVM Fritz!Cards"
+	depends on PCI || ISA
+	help
+	  Enable support for AVM Fritz!Card PCI and PnP.
+
+config MISDN_HFCPCI
+	bool "Support for HFC PCI cards"
+	depends on PCI
+	help
+	  Enable support for card with Cologne Chips Design HFC PCI based
+	  cards.
+
+config MISDN_SPEEDFAX
+	bool "Support for Sedlbauer Speedfax+"
+	depends on PCI || ISA
+	help
+	  Enable support for Sedlbauer Speedfax+.
+
+endif
+
+endmenu
diff --git a/drivers/isdn/hardware/mISDN/Makefile b/drivers/isdn/hardware/mISDN/Makefile
index 67220d7..b11a7db 100644
--- a/drivers/isdn/hardware/mISDN/Makefile
+++ b/drivers/isdn/hardware/mISDN/Makefile
@@ -1,13 +1,31 @@
-L_OBJS :=
-M_OBJS :=
-LX_OBJS :=
-MX_OBJS :=
-O_OBJS :=
-OX_OBJS :=
-L_TARGET :=
-O_TARGET := vmlinux-obj.o
-
+# Makefile for the modular ISDN driver
+#
 # EXTRA_CFLAGS += -S -g
+#
+
+obj-$(CONFIG_MISDN_DRV) += mISDN_core.o
+obj-$(CONFIG_MISDN_DRV) += mISDN_isac.o
+obj-$(CONFIG_MISDN_DRV) += mISDN_l1.o
+obj-$(CONFIG_MISDN_DRV) += mISDN_l2.o
+obj-$(CONFIG_MISDN_DRV) += l3udss1.o
+obj-$(CONFIG_MISDN_DRV) += mISDN_capi.o
+obj-$(CONFIG_MISDN_DRV) += mISDN_dtmf.o
+
+ifdef CONFIG_MISDN_AVM_FRITZ
+obj-$(CONFIG_MISDN_DRV) += avmfritz.o
+endif
+
+ifdef CONFIG_MISDN_HFCPCI
+obj-$(CONFIG_MISDN_DRV) += hfcpci.o
+endif
+
+ifdef CONFIG_MISDN_SPEEDFAX
+obj-$(CONFIG_MISDN_DRV) += sedlfax.o
+endif
+
+ifdef CONFIG_I4L_CAPI_LAYER
+obj-$(CONFIG_MISDN_DRV) += I4LmISDN.o
+endif
 
 # multi objects
 
@@ -24,90 +42,6 @@ mISDN_capi-objs := capi.o contr.o listen.o appl.o plci.o cplci.o ncci.o asn1.o \
                    asn1_basic_service.o asn1_address.o asn1_enc.o capi_enc.o \
                    supp_serv.o helper.o l3helper.o debug.o fsm.o
 mISDN_dtmf-objs := dtmf.o helper.o debug.o
-
-ifdef CONFIG_I4L_CAPI_LAYER
 I4LmISDN-objs := i4l_mISDN.o helper.o l3helper.o debug.o fsm.o
-endif
 
-LX_OBJS += core.o
-
-ifdef MEMDBG
-EXTRA_CFLAGS += -DMEMDBG
-MX_OBJS += memdbg.o
-endif
-
-#ifeq ($(CONFIG_ISDN_DRV_mISDN),y)
-#  O_TARGET += mISDN.o
-#else
-#  ifeq ($(CONFIG_ISDN_DRV_mISDN),m)
-#    O_TARGET += mISDN.o
-#    M_OBJS += mISDN.o
-#  endif
-#endif
-
-export-objs := core.o isac.o
-
-obj-$(CONFIG_ISDN_DRV_mISDN) :=
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_core.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_isac.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += avmfritz.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += sedlfax.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += hfcpci.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_l1.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_l2.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += l3udss1.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_capi.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += mISDN_dtmf.o
-obj-$(CONFIG_ISDN_DRV_mISDN) += I4LmISDN.o
-
-M_OBJS := $(obj-m)
-
-include $(TOPDIR)/Rules.make
-
-
-mISDN_core.o: $(mISDN_core-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-mISDN_isac.o: $(mISDN_isac-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-avmfritz.o: $(avmfritz-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-sedlfax.o: $(sedlfax-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-hfcpci.o: $(hfcpci-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-mISDN_l1.o: $(mISDN_l1-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-mISDN_l2.o: $(mISDN_l2-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-l3udss1.o: $(l3udss1-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-mISDN_capi.o: $(mISDN_capi-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-mISDN_dtmf.o: $(mISDN_dtmf-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-ifdef CONFIG_I4L_CAPI_LAYER
-I4LmISDN.o: $(I4LmISDN-objs)
-	$(RM) $@
-	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
-
-endif
+include Rules.mISDN
diff --git a/drivers/isdn/hardware/mISDN/Rules.mISDN b/drivers/isdn/hardware/mISDN/Rules.mISDN
new file mode 100755
index 0000000..a5c7212
--- /dev/null
+++ b/drivers/isdn/hardware/mISDN/Rules.mISDN
@@ -0,0 +1,63 @@
+# 
+# local Rules for 2.4
+#
+
+O_TARGET := vmlinux-obj.o
+
+ifdef MEMDBG
+EXTRA_CFLAGS += -DMEMDBG
+MX_OBJS += memdbg.o
+endif
+
+export-objs := core.o isac.o
+
+M_OBJS := $(obj-m)
+
+include $(TOPDIR)/Rules.make
+
+mISDN_core.o: $(mISDN_core-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+mISDN_isac.o: $(mISDN_isac-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+avmfritz.o: $(avmfritz-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+sedlfax.o: $(sedlfax-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+hfcpci.o: $(hfcpci-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+mISDN_l1.o: $(mISDN_l1-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+mISDN_l2.o: $(mISDN_l2-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+l3udss1.o: $(l3udss1-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+mISDN_capi.o: $(mISDN_capi-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+mISDN_dtmf.o: $(mISDN_dtmf-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+ifdef CONFIG_I4L_CAPI_LAYER
+I4LmISDN.o: $(I4LmISDN-objs)
+	$(RM) $@
+	$(LD) -r -o $@ $(filter-out $(MODVERFILE) dummy ,$^)
+
+endif
diff --git a/km_mISDN.spec b/km_mISDN.spec
index 1926646..53eeb63 100644
--- a/km_mISDN.spec
+++ b/km_mISDN.spec
@@ -1,7 +1,7 @@
 Vendor:       SuSE GmbH, Nuernberg, Germany
 Distribution: SuSE Linux 8.2 (i386)
 Name:         km_mISDN
-Release:      1
+Release:      2
 Packager:     feedback@suse.de
 
 Copyright:    Karsten Keil GPL