From a6a47fc5c465fdf36c04d52fd865b467dfc123c6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 14 Jun 2010 14:11:35 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Disable CONFIG_MISDN_NETJET. svn path=/dists/sid/linux-2.6/; revision=15870 --- debian/changelog | 4 ++++ debian/config/config | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e6931db4a..1e1c4a4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,10 @@ linux-2.6 (2.6.32-16) UNRELEASED; urgency=low * 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 Tue, 01 Jun 2010 09:23:57 -0600 linux-2.6 (2.6.32-15) unstable; urgency=low diff --git a/debian/config/config b/debian/config/config index 2da6919bb..7decd5f00 100644 --- a/debian/config/config +++ b/debian/config/config @@ -668,7 +668,8 @@ CONFIG_MISDN_AVMFRITZ=m 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