[kernel] r7866 - in dists/sid/linux-2.6/debian: . arch/i386

[Bastian Blank]

Author: waldi
Date: Mon Nov 20 18:15:41 2006
New Revision: 7866

Modified:
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/arch/i386/config.486
   dists/sid/linux-2.6/debian/arch/i386/config.686
   dists/sid/linux-2.6/debian/arch/i386/config.686-bigmem
   dists/sid/linux-2.6/debian/arch/i386/config.k7
   dists/sid/linux-2.6/debian/changelog
Log:
* debian/arch/i386: Reenable AVM isdn card modules.
* debian/changelog: Update.


Modified: dists/sid/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config	Mon Nov 20 18:15:41 2006
@@ -846,6 +846,12 @@
 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

Modified: dists/sid/linux-2.6/debian/arch/i386/config.486
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.486	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.486	Mon Nov 20 18:15:41 2006
@@ -61,14 +61,6 @@
 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

Modified: dists/sid/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.686	Mon Nov 20 18:15:41 2006
@@ -41,12 +41,6 @@
 # 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

Modified: dists/sid/linux-2.6/debian/arch/i386/config.686-bigmem
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.686-bigmem	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.686-bigmem	Mon Nov 20 18:15:41 2006
@@ -43,12 +43,6 @@
 # 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

Modified: dists/sid/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.k7	Mon Nov 20 18:15:41 2006
@@ -42,12 +42,12 @@
 # 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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Nov 20 18:15:41 2006
@@ -83,7 +83,10 @@
   * Added support for Atari EtherNEC, Aranym, video, keyboard, mouse, and serial
     by Michael Schmitz
 
- -- Christian T. Steigies <cts at debian.org>  Mon, 20 Nov 2006 00:48:50 +0100
+  [ Bastian Blank ]
+  * [i386] Reenable AVM isdn card modules. (closes: #386872)
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 20 Nov 2006 18:13:45 +0100
 
 linux-2.6 (2.6.18-5) unstable; urgency=low