Commit 73fbf4f9 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] misc sound/oss bits

 - a couple of PCI drivers made dependent on CONFIG_PCI
 - signed char fix in wavfront.c
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3c5a76a1
......@@ -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
......
......@@ -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 "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment