[PATCH] misc sound/oss bits

 - a couple of PCI drivers made dependent on CONFIG_PCI
 - signed char fix in wavfront.c

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 5859ca26ee4cda6fe97fd9b2bf9f0087f12c2acd..46022a534932f3e0e2126451ae61d18f6af4b8c8 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -127,8 +127,8 @@ config SOUND_ES1371
          <file:Documentation/sound/oss/es1371>.
 
 config SOUND_ESSSOLO1
-       tristate "ESS Technology Solo1"
-       depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+       tristate "ESS Technology Solo1" 
+       depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT && PCI
        help
          Say Y or M if you have a PCI sound card utilizing the ESS Technology
          Solo1 chip. To find out if your sound card uses a
@@ -139,7 +139,7 @@ config SOUND_ESSSOLO1
 
 config SOUND_MAESTRO
        tristate "ESS Maestro, Maestro2, Maestro2E driver"
-       depends on SOUND_PRIME!=n && SOUND
+       depends on SOUND_PRIME!=n && SOUND && PCI
        help
          Say Y or M if you have a sound system driven by ESS's Maestro line
          of PCI sound chips.  These include the Maestro 1, Maestro 2, and

diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c
index d7d00caeb23084f6149ad6cfa0826468913587c5..4875565a05583c35ebbaa65dd69cfc06774981a3 100644 (file)
--- a/sound/oss/wavfront.c
+++ b/sound/oss/wavfront.c
@@ -1402,7 +1402,7 @@ wavefront_fetch_multisample (wavefront_patch_info *header)
        num_samples = (1 << log_ns[0]);
     
        for (i = 0; i < num_samples; i++) {
-               char d[2];
+               s8 d[2];
        
                if ((d[0] = wavefront_read ()) == -1) {
                        printk (KERN_ERR LOGNAME "upload multisample failed "