SOURCES (LINUX_2_6): kernel-x86_64.config, kernel-x86_64-smp.confi...

[qboosh]

Author: qboosh                       Date: Mon Dec 12 18:24:10 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- reenabled ISDN (CAPI only, no I4L)

---- Files affected:
SOURCES:
   kernel-x86_64.config (1.1.2.107 -> 1.1.2.108) , kernel-x86_64-smp.config (1.1.2.107 -> 1.1.2.108) 

---- Diffs:

================================================================
Index: SOURCES/kernel-x86_64.config
diff -u SOURCES/kernel-x86_64.config:1.1.2.107 SOURCES/kernel-x86_64.config:1.1.2.108
--- SOURCES/kernel-x86_64.config:1.1.2.107	Wed Dec  7 02:34:41 2005
+++ SOURCES/kernel-x86_64.config	Mon Dec 12 19:24:05 2005
@@ -515,6 +515,7 @@
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 
 #
@@ -1278,7 +1279,43 @@
 #
 # ISDN subsystem
 #
-# CONFIG_ISDN is not set
+CONFIG_ISDN=m
+
+#
+# Old ISDN4Linux
+#
+# CONFIG_ISDN_I4L is not set
+
+#
+# CAPI subsystem
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+
+#
+# Active AVM cards
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+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
+
+#
+# Active Eicon DIVA Server cards
+#
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
 
 #
 # Telephony Support

================================================================
Index: SOURCES/kernel-x86_64-smp.config
diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.107 SOURCES/kernel-x86_64-smp.config:1.1.2.108
--- SOURCES/kernel-x86_64-smp.config:1.1.2.107	Wed Dec  7 02:34:41 2005
+++ SOURCES/kernel-x86_64-smp.config	Mon Dec 12 19:24:05 2005
@@ -637,6 +637,7 @@
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 
 #
@@ -1399,7 +1400,43 @@
 #
 # ISDN subsystem
 #
-# CONFIG_ISDN is not set
+CONFIG_ISDN=m
+
+#
+# Old ISDN4Linux
+#
+# CONFIG_ISDN_I4L is not set
+
+#
+# CAPI subsystem
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+
+#
+# Active AVM cards
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+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
+
+#
+# Active Eicon DIVA Server cards
+#
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
 
 #
 # Telephony Support
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.107&r2=1.1.2.108&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.107&r2=1.1.2.108&f=u