From 9f92eae041d6d7680fef685437b98a7a4cf72678 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 14 Jun 2010 14:40:28 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config: Disable ISDN_I4L and related options. svn path=/dists/sid/linux-2.6/; revision=15872 --- debian/changelog | 1 + debian/config/alpha/config | 85 --------------------- debian/config/armel/config.iop32x | 5 -- debian/config/armel/config.ixp4xx | 5 -- debian/config/armel/config.kirkwood | 54 ------------- debian/config/armel/config.orion5x | 54 ------------- debian/config/armel/config.versatile | 5 -- debian/config/config | 6 ++ debian/config/hppa/config | 5 -- debian/config/i386/none/config.486 | 5 -- debian/config/i386/none/config.686 | 5 -- debian/config/i386/none/config.686-bigmem | 5 -- debian/config/kernelarch-x86/config | 53 ------------- debian/config/kernelarch-x86/config-arch-32 | 39 ---------- debian/config/kernelarch-x86/config-arch-64 | 5 -- debian/config/m68k/config | 5 -- debian/config/mips/config.4kc-malta | 46 ----------- debian/config/mips/config.5kc-malta | 46 ----------- debian/config/mips/config.r4k-ip22 | 5 -- debian/config/mips/config.r5k-ip32 | 5 -- debian/config/mips/config.sb1-bcm91250a | 5 -- debian/config/mips/config.sb1a-bcm91480b | 5 -- debian/config/mipsel/config.r5k-cobalt | 1 - debian/config/powerpc/config | 1 - debian/config/sparc/config | 5 -- 25 files changed, 7 insertions(+), 449 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e1c4a4db..15dbb0774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ linux-2.6 (2.6.32-16) UNRELEASED; urgency=low [ Bastian Blank ] * Disable mISDN support for NETJet cards. The driver binds a generic PCI bridge. + * Disable ISDN4Linux drivers. -- dann frazier Tue, 01 Jun 2010 09:23:57 -0600 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 38f4e5040..0f9e1bdaa 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -396,14 +396,8 @@ CONFIG_INPUT_TOUCHSCREEN=y ## 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 ## @@ -437,85 +431,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index f8fd4fcb0..8159bf175 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -314,11 +314,6 @@ CONFIG_TABLET_USB_WACOM=m ## CONFIG_INPUT_TOUCHSCREEN=y -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/leds/Kconfig ## diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index c18a2a948..774629e08 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -316,11 +316,6 @@ CONFIG_TABLET_USB_WACOM=m ## CONFIG_INPUT_TOUCHSCREEN=y -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/leds/Kconfig ## diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 83219ce51..b7f159e4e 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -208,7 +208,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -CONFIG_ISDN_I4L=m CONFIG_ISDN_CAPI=m ## @@ -242,59 +241,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index fcc7ec0b2..7b21f1f51 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -203,7 +203,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -CONFIG_ISDN_I4L=m CONFIG_ISDN_CAPI=m ## @@ -237,59 +236,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index c781c064c..58767b18f 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -219,11 +219,6 @@ CONFIG_TABLET_USB_WACOM=m ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/leds/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 5c7a02712..40b7400a0 100644 --- a/debian/config/config +++ b/debian/config/config @@ -648,6 +648,12 @@ CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_W90X900=m +## +## file: drivers/isdn/Kconfig +## +# CONFIG_ISDN is not set +# CONFIG_ISDN_I4L is not set + ## ## file: drivers/isdn/capi/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 72fe4f7ff..53aab33cd 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -188,11 +188,6 @@ CONFIG_SERIO_RAW=m ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/Kconfig ## diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486 index 3001980c1..77f3a785a 100644 --- a/debian/config/i386/none/config.486 +++ b/debian/config/i386/none/config.486 @@ -47,11 +47,6 @@ CONFIG_I2C_STUB=m ## CONFIG_MOUSE_PS2_OLPC=y -## -## file: drivers/isdn/i4l/Kconfig -## -CONFIG_ISDN_DRV_LOOP=m - ## ## file: drivers/mca/Kconfig ## diff --git a/debian/config/i386/none/config.686 b/debian/config/i386/none/config.686 index 2b86974ae..df662d013 100644 --- a/debian/config/i386/none/config.686 +++ b/debian/config/i386/none/config.686 @@ -26,11 +26,6 @@ CONFIG_M686=y # CONFIG_I2C_ELEKTOR is not set CONFIG_I2C_STUB=m -## -## file: drivers/isdn/i4l/Kconfig -## -# CONFIG_ISDN_DRV_LOOP is not set - ## ## file: drivers/media/video/Kconfig ## diff --git a/debian/config/i386/none/config.686-bigmem b/debian/config/i386/none/config.686-bigmem index 2532f456c..a257c86ec 100644 --- a/debian/config/i386/none/config.686-bigmem +++ b/debian/config/i386/none/config.686-bigmem @@ -33,11 +33,6 @@ CONFIG_M686=y # CONFIG_I2C_ELEKTOR is not set CONFIG_I2C_STUB=m -## -## file: drivers/isdn/i4l/Kconfig -## -# CONFIG_ISDN_DRV_LOOP is not set - ## ## file: drivers/media/video/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 6b6671979..15cdad5bf 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -594,7 +594,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -CONFIG_ISDN_I4L=m CONFIG_ISDN_CAPI=m ## @@ -628,58 +627,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 2941f18ab..53c2ff4e8 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -176,51 +176,12 @@ CONFIG_MOUSE_INPORT=m CONFIG_MOUSE_LOGIBM=m 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 ## diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 673e3ee47..61f744a51 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -85,11 +85,6 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -## -## file: drivers/isdn/i4l/Kconfig -## -CONFIG_ISDN_DIVERSION=m - ## ## file: drivers/macintosh/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 18915e3ec..338cf8645 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -80,11 +80,6 @@ CONFIG_INPUT_MOUSE=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index d53d998ae..9828533ba 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -432,7 +432,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -CONFIG_ISDN_I4L=m CONFIG_ISDN_CAPI=m ## @@ -473,51 +472,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 334548118..7180cb2d5 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -431,7 +431,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -CONFIG_ISDN_I4L=m CONFIG_ISDN_CAPI=m ## @@ -473,51 +472,6 @@ CONFIG_ISDN_DIVAS_DIVACAPI=m CONFIG_ISDN_DIVAS_USERIDI=m 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 ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index b8deb4ff1..b84f31aa7 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -256,11 +256,6 @@ CONFIG_SERIO_RAW=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/radio/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 180e467d4..cc6ff3c89 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -288,11 +288,6 @@ CONFIG_SERIO_RAW=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/radio/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 6944067ae..bf52c2b60 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -329,11 +329,6 @@ CONFIG_SERIO_LIBPS2=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/radio/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 4094d292a..6a7b2bb72 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -351,11 +351,6 @@ CONFIG_SERIO_LIBPS2=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/radio/Kconfig ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 735473d50..dc2238458 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -237,7 +237,6 @@ CONFIG_SERIO_LIBPS2=m ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -# CONFIG_ISDN_I4L is not set CONFIG_ISDN_CAPI=m ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 50c295c45..c8e05f256 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -368,7 +368,6 @@ CONFIG_INPUT_TOUCHSCREEN=y ## file: drivers/isdn/Kconfig ## CONFIG_ISDN=y -# CONFIG_ISDN_I4L is not set CONFIG_ISDN_CAPI=m ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index fb133fc4f..444b2c555 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -228,11 +228,6 @@ CONFIG_SERIO_LIBPS2=y ## # CONFIG_INPUT_TOUCHSCREEN is not set -## -## file: drivers/isdn/Kconfig -## -# CONFIG_ISDN is not set - ## ## file: drivers/media/Kconfig ##