CVS: 2.3/Documentation Configure.help,1.14,1.15

[Roman Z. <zi...@us...>]

Update of /cvsroot/linux-apus/2.3/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv11606/Documentation

Modified Files:
	Configure.help 
Log Message:
conflict fixes from import bitkeeper (2.4.6)

Index: Configure.help
===================================================================
RCS file: /cvsroot/linux-apus/2.3/Documentation/Configure.help,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Configure.help	2001/06/10 00:17:27	1.14
+++ Configure.help	2001/07/08 16:59:53	1.15
@@ -7537,6 +7537,40 @@
   configure your card and that /etc/pcmcia/wireless.opts works :
     http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 
+Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards
+CONFIG_AIRO
+  This is the standard Linux driver to support Cisco/Aironet ISA
+  and PCI 802.11 wireless cards.
+  It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
+  - with or without encryption) as well as card before the Cisco
+  aquisition (Aironet 4500, Aironet 4800, Aironet 4800B).
+
[...1035 lines suppressed...]
   say M here and read Documentation/modules.txt. The module will be
-  called radio-miropcm20.o
+  called miropcm20.o
+
+miroSOUND PCM20 radio RDS user interface (EXPERIMENTAL)
+CONFIG_RADIO_MIROPCM20_RDS
+  Choose Y here if you want to see RDS/RBDS information like RadioText,
+  Programme Service name, Clock Time and date, Programme TYpe and
+  Traffic Announcement/Programme identification. You also need to say
+  Y to "miroSOUND PCM20 radio" and devfs!
+
+  It's not possible to read the raw RDS packets from the device, so
+  the driver cant provide an V4L interface for this. But the
+  availability of RDS is reported over V4L by the basic driver already.
+  Here RDS can be read from files in /dev/v4l/rds.
+
+  As module the driver will be called miropcm20-rds.o.
 
 GemTek Radio Card
 CONFIG_RADIO_GEMTEK