Update of /cvsroot/alsa/alsa-kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv25276

Modified Files:
        Kconfig 
Log Message:
Sync with the 2.6 kernel tree


Index: Kconfig
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/Kconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Kconfig     23 May 2003 16:00:37 -0000      1.4
+++ Kconfig     20 Aug 2003 09:10:26 -0000      1.5
@@ -1,6 +1,43 @@
 # sound/Config.in
 #
 
+menu "Sound"
+
+config SOUND
+       tristate "Sound card support"
+       help
+         If you have a sound card in your computer, i.e. if it can say more
+         than an occasional beep, say Y.  Be sure to have all the information
+         about your sound card and its configuration down (I/O port,
+         interrupt and DMA channel), because you will be asked for it.
+
+         You want to read the Sound-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>. General information about
+         the modular sound system is contained in the files
+         <file:Documentation/sound/oss/Introduction>.  The file
+         <file:Documentation/sound/oss/README.OSS> contains some slightly
+         outdated but still useful information as well.  Newer sound
+         driver documentation is found in <file:Documentation/sound/alsa/*>.
+
+         If you have a PnP sound card and you want to configure it at boot
+         time using the ISA PnP tools (read
+         <http://www.roestock.demon.co.uk/isapnptools/>), then you need to
+         compile the sound card support as a module ( = code which can be
+         inserted in and removed from the running kernel whenever you want)
+         and load that module after the PnP configuration is finished.  To do
+         this, say M here and read <file:Documentation/modules.txt> as well
+         as <file:Documentation/sound/oss/README.modules>; the module will be
+         called soundcore.
+
+         I'm told that even without a sound card, you can make your computer
+         say more than an occasional beep, by programming the PC speaker.
+         Kernel patches and supporting utilities to do that are in the pcsp
+         package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
+
+source "sound/oss/dmasound/Kconfig"
+
+if !M68K
+
 menu "Advanced Linux Sound Architecture"
        depends on SOUND!=n
 
@@ -44,5 +81,9 @@
          Say 'Y' or 'M' to enable Open Sound System drivers.
 
 source "sound/oss/Kconfig"
+
+endmenu
+
+endif
 
 endmenu



-------------------------------------------------------
This SF.net email is sponsored by Dice.com.
Did you know that Dice has over 25,000 tech jobs available today? From
careers in IT to Engineering to Tech Sales, Dice has tech jobs from the
best hiring companies. http://www.dice.com/index.epl?rel_code=104
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to