6 files changed, 9 insertions, 40 deletions

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 4c419300305d..4b30ae6d8ba5 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -5,23 +5,22 @@
 #
 # Prompt user for primary drivers.
 
-config OBSOLETE_OSS
+config OSS_OBSOLETE
         bool "Obsolete OSS drivers"
         depends on SOUND_PRIME
         help
           This option enables support for obsolete OSS drivers that
-          are scheduled for removal in the near future since there
-          are ALSA drivers for the same hardware.
+          are scheduled for removal in the near future.
 
           Please contact Adrian Bunk <bunk@stusta.de> if you had to
-          say Y here because your soundcard is not properly supported
+          say Y here because your hardware is not properly supported
           by ALSA.
 
           If unsure, say N.
 
 config SOUND_BT878
         tristate "BT878 audio dma"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OSS_OBSOLETE
         ---help---
           Audio DMA support for bt878 based grabber boards.  As you might have
           already noticed, bt878 is listed with two functions in /proc/pci.
@@ -45,22 +44,9 @@ config SOUND_BCM_CS4297A
           note that CONFIG_KGDB should not be enabled at the same
           time, since it also attempts to use this UART port.
 
-config SOUND_ES1371
-        tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-        depends on SOUND_PRIME && PCI && OBSOLETE_OSS
-        help
-          Say Y or M if you have a PCI sound card utilizing the Ensoniq
-          ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
-          your sound card uses an ES1371 without removing your computer's
-          cover, use lspci -n and look for the PCI ID 1274:1371. Since
-          Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI
-          models are either ES1370 or ES1371 based. This driver differs
-          slightly from OSS/Free, so PLEASE READ
-          <file:Documentation/sound/oss/es1371>.
-
 config SOUND_ICH
         tristate "Intel ICH (i8xx) audio support"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OSS_OBSOLETE
         help
           Support for integral audio in Intel's I/O Controller Hub (ICH)
           chipset, as used on the 810/820/840 motherboards.
@@ -362,7 +348,7 @@ config MSND_FIFOSIZE
 
 config SOUND_VIA82CXXX
         tristate "VIA 82C686 Audio Codec"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OSS_OBSOLETE
         help
           Say Y here to include support for the audio codec found on VIA
           82Cxxx-based chips. Typically these are built into a motherboard.
@@ -416,7 +402,7 @@ config SOUND_DMAP
 
 config SOUND_CS4232
         tristate "Crystal CS4232 based (PnP) cards"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OSS_OBSOLETE
         help
           Say Y here if you have a card based on the Crystal CS4232 chip set,
           which uses its own Plug and Play protocol.
@@ -735,7 +721,7 @@ config SOUND_WAVEARTIST
 
 config SOUND_TVMIXER
         tristate "TV card (bt848) mixer support"
-        depends on SOUND_PRIME && I2C && VIDEO_V4L1
+        depends on SOUND_PRIME && I2C && VIDEO_V4L1 && OSS_OBSOLETE
         help
           Support for audio mixer facilities on the BT848 TV frame-grabber
           card.
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index f813ae9c2134..4d5cf05b8922 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -344,7 +344,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
         if (cmd == SOUND_OLD_MIXER_INFO) {
                 _old_mixer_info info;
                 memset(&info,0,sizeof(info));
-                strlcpy(info.id,"bt878",sizeof(info.id)-1);
+                strlcpy(info.id, "bt878", sizeof(info.id));
                 strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
                 if (copy_to_user(argp, &info, sizeof(info)))
                         return -EFAULT;
diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig
index 18e149f52a88..71b313479f83 100644
--- a/sound/oss/dmasound/Kconfig
+++ b/sound/oss/dmasound/Kconfig
@@ -12,20 +12,6 @@ config DMASOUND_ATARI
           want). If you want to compile it as a module, say M here and read
           <file:Documentation/kbuild/modules.txt>.
 
-config DMASOUND_PMAC
-        tristate "PowerMac DMA sound support"
-        depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS
-        select DMASOUND
-        help
-          If you want to use the internal audio of your PowerMac in Linux,
-          answer Y to this question. This will provide a Sun-like /dev/audio,
-          compatible with the Linux/i386 sound system. Otherwise, say N.
-
-          This driver is also available as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you
-          want). If you want to compile it as a module, say M here and read
-          <file:Documentation/kbuild/modules.txt>.
-
 config DMASOUND_PAULA
         tristate "Amiga DMA sound support"
         depends on (AMIGA || APUS) && SOUND
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index 016b918329ad..a8057f259553 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -75,7 +75,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/poll.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
 
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 72a8a0ed36a2..d98d311542ed 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -207,7 +207,6 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
 #include <linux/bitops.h>
 #include <linux/proc_fs.h>
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 7ab3a732e184..5d3c0372df32 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -32,7 +32,6 @@
 #include <linux/poll.h>
 #include <linux/soundcard.h>
 #include <linux/ac97_codec.h>
-#include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>