* debian/changelog: Update.

* debian/config/config: Disable CONFIG_MISDN_NETJET.

svn path=/dists/sid/linux-2.6/; revision=15870
This commit is contained in:
Bastian Blank 2010-06-14 14:11:35 +00:00
parent 1fc793a8dd
commit a6a47fc5c4
2 changed files with 6 additions and 1 deletions

4
debian/changelog vendored
View File

@ -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 <dannf@debian.org> Tue, 01 Jun 2010 09:23:57 -0600
linux-2.6 (2.6.32-15) unstable; urgency=low

View File

@ -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