Commit 29da67a0 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://gkernel.bkbits.net/misc-2.5

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 8cb0cee4 30621ad6
...@@ -26,3 +26,8 @@ CONFIG_PHONE_IXJ ...@@ -26,3 +26,8 @@ CONFIG_PHONE_IXJ
If you do not have any Quicknet telephony cards, you can safely If you do not have any Quicknet telephony cards, you can safely
say N here. say N here.
CONFIG_PHONE_IXJ_PCMCIA
Say Y here to configure in PCMCIA service support for the Quicknet
cards manufactured by Quicknet Technologies, Inc. This changes the
card initialization code to work with the card manager daemon.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment