[kernel] r15872 - in dists/sid/linux-2.6/debian: . config config/alpha config/armel config/hppa config/i386/none config/kernelarch-x86 config/m68k config/mips config/mipsel config/powerpc config/sparc

Bastian Blank waldi at alioth.debian.org
Mon Jun 14 14:40:46 UTC 2010 

Author: waldi
Date: Mon Jun 14 14:40:28 2010
New Revision: 15872

Log:
* debian/changelog: Update.
* debian/config: Disable ISDN_I4L and related options.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/alpha/config
   dists/sid/linux-2.6/debian/config/armel/config.iop32x
   dists/sid/linux-2.6/debian/config/armel/config.ixp4xx
   dists/sid/linux-2.6/debian/config/armel/config.kirkwood
   dists/sid/linux-2.6/debian/config/armel/config.orion5x
   dists/sid/linux-2.6/debian/config/armel/config.versatile
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/config/hppa/config
   dists/sid/linux-2.6/debian/config/i386/none/config.486
   dists/sid/linux-2.6/debian/config/i386/none/config.686
   dists/sid/linux-2.6/debian/config/i386/none/config.686-bigmem
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
   dists/sid/linux-2.6/debian/config/m68k/config
   dists/sid/linux-2.6/debian/config/mips/config.4kc-malta
   dists/sid/linux-2.6/debian/config/mips/config.5kc-malta
   dists/sid/linux-2.6/debian/config/mips/config.r4k-ip22
   dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/sid/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/sid/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/sid/linux-2.6/debian/config/powerpc/config
   dists/sid/linux-2.6/debian/config/sparc/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/changelog	Mon Jun 14 14:40:28 2010	(r15872)
@@ -43,6 +43,7 @@
   [ Bastian Blank ]
   * Disable mISDN support for NETJet cards. The driver binds a generic PCI
     bridge.
+  * Disable ISDN4Linux drivers.
 
  -- dann frazier <dannf at debian.org>  Tue, 01 Jun 2010 09:23:57 -0600
 

Modified: dists/sid/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/alpha/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/alpha/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -396,15 +396,9 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
-## file: drivers/isdn/act2000/Kconfig
-##
-CONFIG_ISDN_DRV_ACT2000=m
-
-##
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
@@ -438,85 +432,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=m
-
-##
-## file: drivers/isdn/icn/Kconfig
-##
-CONFIG_ISDN_DRV_ICN=m
-
-##
-## file: drivers/isdn/pcbit/Kconfig
-##
-CONFIG_ISDN_DRV_PCBIT=m
-
-##
-## file: drivers/isdn/sc/Kconfig
-##
-CONFIG_ISDN_DRV_SC=m
-
-##
 ## file: drivers/media/Kconfig
 ##
 CONFIG_DVB_CORE=m

Modified: dists/sid/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.iop32x	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/armel/config.iop32x	Mon Jun 14 14:40:28 2010	(r15872)
@@ -315,11 +315,6 @@
 CONFIG_INPUT_TOUCHSCREEN=y
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_NEW_LEDS=y

Modified: dists/sid/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.ixp4xx	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/armel/config.ixp4xx	Mon Jun 14 14:40:28 2010	(r15872)
@@ -317,11 +317,6 @@
 CONFIG_INPUT_TOUCHSCREEN=y
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_NEW_LEDS=y

Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Mon Jun 14 14:40:28 2010	(r15872)
@@ -208,7 +208,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -243,59 +242,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-CONFIG_ISDN_DIVERSION=m
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_NEW_LEDS=y

Modified: dists/sid/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.orion5x	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/armel/config.orion5x	Mon Jun 14 14:40:28 2010	(r15872)
@@ -203,7 +203,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -238,59 +237,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-CONFIG_ISDN_DIVERSION=m
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_NEW_LEDS=y

Modified: dists/sid/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.versatile	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/armel/config.versatile	Mon Jun 14 14:40:28 2010	(r15872)
@@ -220,11 +220,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/leds/Kconfig
 ##
 # CONFIG_NEW_LEDS is not set

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -649,6 +649,12 @@
 CONFIG_TOUCHSCREEN_W90X900=m
 
 ##
+## file: drivers/isdn/Kconfig
+##
+# CONFIG_ISDN is not set
+# CONFIG_ISDN_I4L is not set
+
+##
 ## file: drivers/isdn/capi/Kconfig
 ##
 CONFIG_CAPI_TRACE=y

Modified: dists/sid/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/hppa/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/hppa/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -189,11 +189,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/Kconfig
 ##
 # CONFIG_VIDEO_DEV is not set

Modified: dists/sid/linux-2.6/debian/config/i386/none/config.486
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/none/config.486	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/i386/none/config.486	Mon Jun 14 14:40:28 2010	(r15872)
@@ -48,11 +48,6 @@
 CONFIG_MOUSE_PS2_OLPC=y
 
 ##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_DRV_LOOP=m
-
-##
 ## file: drivers/mca/Kconfig
 ##
 CONFIG_MCA_LEGACY=y

Modified: dists/sid/linux-2.6/debian/config/i386/none/config.686
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/none/config.686	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/i386/none/config.686	Mon Jun 14 14:40:28 2010	(r15872)
@@ -27,11 +27,6 @@
 CONFIG_I2C_STUB=m
 
 ##
-## file: drivers/isdn/i4l/Kconfig
-##
-# CONFIG_ISDN_DRV_LOOP is not set
-
-##
 ## file: drivers/media/video/Kconfig
 ##
 # CONFIG_USB_W9968CF is not set

Modified: dists/sid/linux-2.6/debian/config/i386/none/config.686-bigmem
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/none/config.686-bigmem	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/i386/none/config.686-bigmem	Mon Jun 14 14:40:28 2010	(r15872)
@@ -34,11 +34,6 @@
 CONFIG_I2C_STUB=m
 
 ##
-## file: drivers/isdn/i4l/Kconfig
-##
-# CONFIG_ISDN_DRV_LOOP is not set
-
-##
 ## file: drivers/media/video/Kconfig
 ##
 # CONFIG_USB_W9968CF is not set

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -594,7 +594,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -629,58 +628,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_CLEVO_MAIL=m

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Mon Jun 14 14:40:28 2010	(r15872)
@@ -177,51 +177,12 @@
 CONFIG_MOUSE_PC110PAD=m
 
 ##
-## file: drivers/isdn/act2000/Kconfig
-##
-CONFIG_ISDN_DRV_ACT2000=m
-
-##
 ## file: drivers/isdn/hardware/avm/Kconfig
 ##
 CONFIG_ISDN_DRV_AVMB1_B1ISA=m
 CONFIG_ISDN_DRV_AVMB1_T1ISA=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-# CONFIG_ISDN_DIVERSION is not set
-
-##
-## file: drivers/isdn/icn/Kconfig
-##
-CONFIG_ISDN_DRV_ICN=m
-
-##
-## file: drivers/isdn/pcbit/Kconfig
-##
-CONFIG_ISDN_DRV_PCBIT=m
-
-##
-## file: drivers/isdn/sc/Kconfig
-##
-CONFIG_ISDN_DRV_SC=m
-
-##
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_WRAP=m

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Mon Jun 14 14:40:28 2010	(r15872)
@@ -86,11 +86,6 @@
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 
 ##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_DIVERSION=m
-
-##
 ## file: drivers/macintosh/Kconfig
 ##
 CONFIG_MACINTOSH_DRIVERS=y

Modified: dists/sid/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/m68k/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/m68k/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -81,11 +81,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/Kconfig
 ##
 # CONFIG_VIDEO_DEV is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.4kc-malta	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.4kc-malta	Mon Jun 14 14:40:28 2010	(r15872)
@@ -432,7 +432,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -474,51 +473,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=m
-
-##
 ## file: drivers/leds/Kconfig
 ##
 # CONFIG_NEW_LEDS is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.5kc-malta	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.5kc-malta	Mon Jun 14 14:40:28 2010	(r15872)
@@ -431,7 +431,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -474,51 +473,6 @@
 CONFIG_ISDN_DIVAS_MAINT=m
 
 ##
-## file: drivers/isdn/hisax/Kconfig
-##
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-##
-## file: drivers/isdn/i4l/Kconfig
-##
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=m
-
-##
 ## file: drivers/leds/Kconfig
 ##
 # CONFIG_NEW_LEDS is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.r4k-ip22	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.r4k-ip22	Mon Jun 14 14:40:28 2010	(r15872)
@@ -257,11 +257,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_CADET is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.r5k-ip32	Mon Jun 14 14:40:28 2010	(r15872)
@@ -289,11 +289,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_GEMTEK_PCI is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Mon Jun 14 14:40:28 2010	(r15872)
@@ -330,11 +330,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_GEMTEK_PCI is not set

Modified: dists/sid/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Mon Jun 14 14:40:28 2010	(r15872)
@@ -352,11 +352,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_GEMTEK_PCI is not set

Modified: dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Mon Jun 14 14:40:28 2010	(r15872)
@@ -237,7 +237,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 
 ##

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -368,7 +368,6 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
-# CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 
 ##

Modified: dists/sid/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/sparc/config	Mon Jun 14 14:28:36 2010	(r15871)
+++ dists/sid/linux-2.6/debian/config/sparc/config	Mon Jun 14 14:40:28 2010	(r15872)
@@ -229,11 +229,6 @@
 # CONFIG_INPUT_TOUCHSCREEN is not set
 
 ##
-## file: drivers/isdn/Kconfig
-##
-# CONFIG_ISDN is not set
-
-##
 ## file: drivers/media/Kconfig
 ##
 CONFIG_VIDEO_V4L1_COMPAT=y

More information about the Kernel-svn-changes mailing list