* debian/arch/i386: Reenable AVM isdn card modules.

* debian/changelog: Update.

svn path=/dists/sid/linux-2.6/; revision=7866

6 files changed, 16 insertions, 27 deletions

diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 8521d93c1f44..e408c8c5729c 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -846,6 +846,12 @@ CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIFS=m
 CONFIG_ISDN_CAPI_CAPIDRV=m
 CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
 CONFIG_CAPI_EICON=y
 CONFIG_ISDN_DIVAS=m
 CONFIG_ISDN_DIVAS_BRIPCI=y
diff --git a/debian/arch/i386/config.486 b/debian/arch/i386/config.486
index ddbe45c9b772..aa028ea004f1 100644
--- a/debian/arch/i386/config.486
+++ b/debian/arch/i386/config.486
@@ -61,14 +61,6 @@ CONFIG_MADGEMC=m
 CONFIG_ISDN_DRV_LOOP=m
 CONFIG_HYSDN=m
 CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
 CONFIG_COMPUTONE=m
 CONFIG_DIGIEPCA=m
 CONFIG_MOXA_INTELLIO=m
diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686
index 580cce5004af..5eb2380c3dd5 100644
--- a/debian/arch/i386/config.686
+++ b/debian/arch/i386/config.686
@@ -41,12 +41,6 @@ CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_ISDN_DRV_LOOP is not set
 # CONFIG_HYSDN is not set
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_C4 is not set
 # CONFIG_COMPUTONE is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
diff --git a/debian/arch/i386/config.686-bigmem b/debian/arch/i386/config.686-bigmem
index fe4048f92c64..091726bcc2b8 100644
--- a/debian/arch/i386/config.686-bigmem
+++ b/debian/arch/i386/config.686-bigmem
@@ -43,12 +43,6 @@ CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_ISDN_DRV_LOOP is not set
 # CONFIG_HYSDN is not set
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_C4 is not set
 # CONFIG_COMPUTONE is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7
index 3624e9ec874a..ef4cd5095d47 100644
--- a/debian/arch/i386/config.k7
+++ b/debian/arch/i386/config.k7
@@ -42,12 +42,12 @@ CONFIG_HAVE_DEC_LOCK=y
 # CONFIG_PCMCIA_XIRTULIP is not set
 # CONFIG_ISDN_DRV_LOOP is not set
 # CONFIG_HYSDN is not set
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set
-# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_C4 is not set
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
 # CONFIG_COMPUTONE is not set
 # CONFIG_DIGIEPCA is not set
 # CONFIG_MOXA_INTELLIO is not set
diff --git a/debian/changelog b/debian/changelog
index ba1a739d1d62..e18dcdede96f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,7 +83,10 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
   * Added support for Atari EtherNEC, Aranym, video, keyboard, mouse, and serial
     by Michael Schmitz
 
- -- Christian T. Steigies <cts@debian.org>  Mon, 20 Nov 2006 00:48:50 +0100
+  [ Bastian Blank ]
+  * [i386] Reenable AVM isdn card modules. (closes: #386872)
+
+ -- Bastian Blank <waldi@debian.org>  Mon, 20 Nov 2006 18:13:45 +0100
 
 linux-2.6 (2.6.18-5) unstable; urgency=low