[PATCH] move "config SOUND" to sound/Kconfig

Allows all architectures to simply include the sound/Kconfig file.
Now somebody can finally update the comment for CONFIG_SOUND ;-).

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 2a11443b8699a82c09247a76d9bbee8873ef59b9..ac87aae3c46fe08caa00f28221a0df9443c02709 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -681,42 +681,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ed75d0c625263fc681d580506283af441649edbb..56b06382f200774851c91ab8aab0022f1aeeb6ef 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -924,42 +924,11 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-menu "Sound"
-       depends on ARCH_ACORN || ARCH_CLPS7500 || ARCH_TBOX || ARCH_SHARK || ARCH_SA1100 || PCI
-
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/>.
+if ARCH_ACORN || ARCH_CLPS7500 || ARCH_TBOX || ARCH_SHARK || ARCH_SA1100 || PCI
 
 source "sound/Kconfig"
 
-endmenu
+endif
 
 source "drivers/misc/Kconfig"
 

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index d7cbd23668dd7b651445c878fede4c5435e1ccfb..6eb60d5cffff4fba82e0289f5987a9eb36c086a2 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -254,42 +254,11 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-menu "Sound"
-       depends on ARCH_ACORN
-
-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.linuxdoc.org/docs.html#howto>. General information about
-         the modular sound system is contained in the files
-         <file:Documentation/sound/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/>.
+if ARCH_ACORN
 
 source "sound/Kconfig"
 
-endmenu
+endif
 
 source "drivers/misc/Kconfig"
 

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 05fb1fe7620f11269609cc5d10231bf31bba4cb0..fb564d7dca9897b7c7209c665aaa4bb19e97b4c1 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -200,43 +200,8 @@ source "drivers/media/Kconfig"
 
 source "fs/Kconfig"
 
-
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5cf13fb93f4e0b161cbfb3af97a116d04228c6dd..078115dcdc7772fa4d6e6abc86bffee28ed69ec6 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1242,42 +1242,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 793c01f525e232f80e0c52e93c2b350efaced7de..38d90448e56082360c7da11c22a2afcb55b5a8ae 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -609,27 +609,8 @@ if !IA64_HP_SIM
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
 source "sound/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ce5f2eed241c5a2650584e0b5d65a8600a3d832b..2a3c72bc00b6dc3ea2bab3896fb89675ccd3c527 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1199,15 +1199,7 @@ config UNIX98_PTY_COUNT
 
 endmenu
 
-
-menu "Sound support"
-
-config SOUND
-       tristate "Sound card support"
-
-source "sound/oss/dmasound/Kconfig"
-
-endmenu
+source "sound/Kconfig"
 
 source "fs/Kconfig"
 

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 2c08a7d8b27d6e7ce92b9262dfa403b79ec0e20d..b35c9c03ec55b9387e9a9918f3cb7de48172c4d0 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -560,42 +560,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 549c5433fc63ae28561e6bf99d5c3ce3402e1254..4a78de54598d5777be2a0a2eb7ddf2ebb3632d8e 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -215,42 +215,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 2e5f437993b336e2f2dc22b8f01dd5a91b0dee50..5afc403e608839982d9bad8717e2d39f4a1615ca 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1342,45 +1342,8 @@ source "drivers/media/Kconfig"
 
 source "fs/Kconfig"
 
-
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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"
-
 source "sound/Kconfig"
 
-endmenu
-
 source "arch/ppc/8xx_io/Kconfig"
 
 source "arch/ppc/8260_io/Kconfig"

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 18f7abaa8fffedf8776fc813a55840e003d7a178..b297e7a89c1750d06ee405a2359ac675b880d588 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -286,42 +286,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 556da8417603b0aba6d835c1b638d4bc0250630d..c86058afcecb4497e7b911300c9e65f1b7e41218 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1179,42 +1179,8 @@ source "drivers/media/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 5f90463c4a85ed1b00a3e13f6d0b479453ed79c1..7b8fd9695044e2743a8855cd20b5e59897935d0a 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -541,43 +541,8 @@ source "drivers/input/Kconfig"
 
 source "fs/Kconfig"
 
-
-menu "Sound card support"
-
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 4bdfda17a5ec9231df76883cf481960bb0fe256a..db794423cff496d5e27e0ac9eb1d1af191fd6f90 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -787,42 +787,8 @@ source "fs/Kconfig"
 
 source "drivers/media/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 011552ac0d2f7c6eabe2bdedb1f3908d6be0dd30..5c785bca09d8a832ad046328a97c85f690a12bd7 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -331,42 +331,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/Introduction>.  The file
-         <file:Documentation/sound/README.OSS> contains some slightly
-         outdated but still useful information as well.
-
-         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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 0d6c80896f730a95c276c4b3d6b4fd9447254f51..46d6829586a62e384dc1422d13c8f962c08e4180 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -443,43 +443,8 @@ source "fs/Kconfig"
 
 source "drivers/video/Kconfig"
 
-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/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/Kconfig"
 
-endmenu
-
 source "drivers/usb/Kconfig"
 
 source "net/bluetooth/Kconfig"

diff --git a/sound/Kconfig b/sound/Kconfig
index dc92d817b245f6deb002dcee017feb68dba1bd7c..28d9624b92d9efdd1050cf0125088ebc83dcf2d8 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -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
 
@@ -46,3 +83,7 @@ config SOUND_PRIME
 source "sound/oss/Kconfig"
 
 endmenu
+
+endif
+
+endmenu