[kernel] r15870 - in dists/sid/linux-2.6/debian: . config

[Bastian Blank]

Author: waldi
Date: Mon Jun 14 14:11:35 2010
New Revision: 15870

Log:
* debian/changelog: Update.
* debian/config/config: Disable CONFIG_MISDN_NETJET.

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Jun 14 12:14:09 2010	(r15869)
+++ dists/sid/linux-2.6/debian/changelog	Mon Jun 14 14:11:35 2010	(r15870)
@@ -40,6 +40,10 @@
   * QNAP TS-11x/TS-21x: Add MPP36 (RAM) and MPP44 (board ID).
   * Add support for the HP t5325 Thin Client.
 
+  [ Bastian Blank ]
+  * Disable mISDN support for NETJet cards. The driver binds a generic PCI
+    bridge.
+
  -- dann frazier <dannf at debian.org>  Tue, 01 Jun 2010 09:23:57 -0600
 
 linux-2.6 (2.6.32-15) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Mon Jun 14 12:14:09 2010	(r15869)
+++ dists/sid/linux-2.6/debian/config/config	Mon Jun 14 14:11:35 2010	(r15870)
@@ -668,7 +668,8 @@
 CONFIG_MISDN_SPEEDFAX=m
 CONFIG_MISDN_INFINEON=m
 CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
+#. Binds a generic PCI bridge
+# CONFIG_MISDN_NETJET is not set
 
 ##
 ## file: drivers/isdn/hysdn/Kconfig