[kernel] r16406 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86 patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Thu Oct  7 01:28:27 2010
New Revision: 16406

Log:
[x86] isdn/i4l: Reenable ISDN4Linux drivers, but mark them as staging

Added:
   dists/sid/linux-2.6/debian/patches/debian/isdn-i4l-mark-as-staging.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   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/patches/series/25

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Oct  7 00:23:44 2010	(r16405)
+++ dists/sid/linux-2.6/debian/changelog	Thu Oct  7 01:28:27 2010	(r16406)
@@ -5,6 +5,7 @@
   * Add stable 2.6.32.24 (trivial fix, already applied)
   * ipg: Remove device claimed by dl2k from pci id table (Closes: #599021)
   * linux-image: Include modules.order in image packages (Closes: #598518)
+  * [x86] isdn/i4l: Reenable ISDN4Linux drivers, but mark them as staging
 
   [ Stephen R. Marenka ]
   * m68k: fix missing io macros.

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct  7 00:23:44 2010	(r16405)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Thu Oct  7 01:28:27 2010	(r16406)
@@ -595,6 +595,7 @@
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
 CONFIG_ISDN_CAPI=m
 
 ##
@@ -629,6 +630,59 @@
 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_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	Thu Oct  7 00:23:44 2010	(r16405)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Thu Oct  7 01:28:27 2010	(r16406)
@@ -177,12 +177,46 @@
 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/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

Added: dists/sid/linux-2.6/debian/patches/debian/isdn-i4l-mark-as-staging.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/isdn-i4l-mark-as-staging.patch	Thu Oct  7 01:28:27 2010	(r16406)
@@ -0,0 +1,15 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] isdn/i4l: mark as staging
+
+We really don't want to support this.
+
+--- a/drivers/isdn/i4l/isdn_common.c
++++ b/drivers/isdn/i4l/isdn_common.c
+@@ -38,6 +38,7 @@
+ MODULE_DESCRIPTION("ISDN4Linux: link layer");
+ MODULE_AUTHOR("Fritz Elfert");
+ MODULE_LICENSE("GPL");
++MODULE_INFO(staging, "Y");
+ 
+ isdn_dev *dev;
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/25
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/25	Thu Oct  7 00:23:44 2010	(r16405)
+++ dists/sid/linux-2.6/debian/patches/series/25	Thu Oct  7 01:28:27 2010	(r16406)
@@ -3,3 +3,4 @@
 + bugfix/all/stable/2.6.32.24.patch
 + bugfix/all/ipg-Remove-device-claimed-by-dl2k-from-pci-id-table.patch
 + bugfix/m68k/m68k_add_missing_io_macros.patch
++ debian/isdn-i4l-mark-as-staging.patch