Modules: SB16/AWE driver

Fix the duplicated PnP entry between sb16 and sbawe drivers.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: OPL3SA2 driver

Fix the conflict of driver name 'opl3sa2' on sysfs with OSS driver.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: CS46xx driver

Reported by <dcb314@hotmail.com> in
http://bugzilla.kernel.org/show_bug.cgi?id=5903Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: au88x0 driver

Fixed an uninitialized variable.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: VIA82xx driver

Added the dxs_support entry for EpoX 9HEAI.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: HDA Codec driver

Added the missing 'Capture Switch' control for Sigmatel STAC92xx codecs.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: Intel8x0 driver

This patch adds a quirk entry for the Dell Optiplex GX270, on which
the volume is set by the headphone control, not the master control.
Signed-off-by: NChris Ball <cjb@mrao.cam.ac.uk>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: ALI5451 driver

This patch uses #defines for the Vendor ID and Device ID and uses the
new PCI_DEVICE macro.
Signed-off-by: NJon Mason <jdmason@us.ibm.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: Trident driver

Some pcnet32 hardware erroneously has the Vendor ID for Trident.  The
pcnet32 driver looks for the PCI ethernet class before grabbing the
hardware, but the current trident driver does not check against the
PCI audio class.  This allows the trident driver to claim the pcnet32
hardware.  This patch prevents that.

Per Jiri Slaby's request, I changed the trident driver to use
PCI_DEVICE macro and PCI ID #defines.

This patch is untested on Trident 4DWAVE_DX hardware, but has been
tested on pcnet32 hardware.
Signed-off-by: NJon Mason <jdmason@us.ibm.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: USB generic driver

On the Audigy 2 ZS, disable all sample rate that are not a multiple of
48 kHz because the others work only with the digital output which is
not yet supported.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>

Modules: YMFPCI driver

Set the (read only) sample rate field in the IEC958 mixer controls to
48 kHz (instead of 44.1 kHz) because that is the rate actually
supported by the hardware.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>

Modules: AC97 Codec

Fix CLFE channel setting of ALC850 (ALSA bug#1731).
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: CS5535 driver

Added AMD CS5536 to the cs5535audio driver.
Signed-off-by: NRene Rebe <rene@exactcode.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: USB generic driver

Some widespread USB interface chips with adaptive iso endpoints hang
after receiving a series of empty packets when they expect data (ALSA
bug#1585).  To avoid this, we have to send packets containing silence
(zero samples) instead.
Signed-off-by: NClemens Ladisch <clemens@ladisch.de>

Modules: BT87x driver
Signed-off-by: NJaroslav Kysela <perex@suse.cz>

Modules: AC97 Codec

Added a blacklist to suppress to create jack sense controls.
These controls must be always off on some devices (e.g. Thinkpad).
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: HDA Codec driver

Added an ALC260 model entry (basic) for Sony VAIO.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: Digigram PCXHR driver

Fix the hardware set up when the sample rate is changed multiple times.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: HDA Intel driver

This patch adds the Intel ICH8 HD Audio DID to the hda_intel.c audio driver.
Signed-off-by: NJason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: CA0106 driver

Description:
Shuttle XPC SD11G5 which has an onboard Creative Labs
Sound Blaster Live! 24-bit EAX
high-definition 7.1 audio processor'.
Fixes ALSA bug#1600
Signed-off-by: NJames Courtier-Dutton <James@superbug.co.uk>

Modules: ALSA Core

Remove BKL from sound/core/info.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: VIA82xx driver

Added a dxs_support entry for Jetway K8M8MS.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: EMU10K1/EMU10K2 driver

Fix the confliction of 'Front' controls on models with STAC9758 codec.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: BT87x driver

The patch siply adds the PCI IDs of AVerMedia Studio No. 103, 203,
and possibly even other versions with the same PCI IDs to the snd-bt87x
driver and sets its default sampling rate to 48 kHz.
Signed-off-by: NMartin Drab <drab@kepler.fjfi.cvut.cz>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: EMU10K1/EMU10K2 driver

Fix silence problems on some boards after suspend/resume (bug#1674).
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Fix compilation of some ISA drivers without CONFIG_PNP.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: Intel8x0 driver

in recent -mm kernels additional quirks for ac97 hardware in HP laptops
have been added.  However, now the list in intel8x0.c contains a duplicate,
since the HP nx6110 and nc6120 have identical subdevice ids.

This was introduced in -mm1 by the following patch:
add-new-quirk-for-devices-with-mute-leds-and-separate-headphone-volume.patch

Since the HP nx6110 and nc6120 are almost identical, both entries
should really be combined, as in the following patch. I have checked
that AC97_TUNE_HP_MUTE_LED is the right thing to do.
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Modules: VIA82xx driver

Add a dxs_support entry for ASUS mobo.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Some pcnet32 hardware erroneously has the Vendor ID for Trident.  The
pcnet32 driver looks for the PCI ethernet class before grabbing the
hardware, but the current trident driver does not check against the PCI
audio class.  This allows the trident driver to claim the pcnet32 hardware.
 This patch prevents that.

This revised version of the OSS Trident patch includes PCI_DEVICE Macro
usage.
Signed-off-by: NJon Mason <jdmason@us.ibm.com>
Signed-off-by: NMuli Ben-Yehuda <mulix@mulix.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Signed-off-by: NDavid S. Miller <davem@davemloft.net>

Remove the "inline" keyword from a bunch of big functions in the kernel with
the goal of shrinking it by 30kb to 40kb
Signed-off-by: NArjan van de Ven <arjan@infradead.org>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Acked-by: NJeff Garzik <jgarzik@pobox.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Signed-off-by: NAdrian Bunk <bunk@stusta.de>

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

sound/oss/dmasound/dmasound_atari.c has static expand_bal
sound/oss/dmasound/dmasound_q40.c has static expand_bal
sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal
sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c
all 4 include dmasound.h; extern for expand_bal used to be there,
which is a bloody bad idea, considering _atari and _q40.  Moved the
extern to trans_16.c.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Cast is not an lvalue
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Avoid warnings about use of cast expressions as lvalues
Signed-off-by: NRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Just add the missing PCI ID.

Cc: perex@suse.cz
Cc: tiwai@suse.de
Signed-off-by: NAndi Kleen <ak@suse.de>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

- Move capable() from sched.h to capability.h;

- Use <linux/capability.h> where capable() is used
	(in include/, block/, ipc/, kernel/, a few drivers/,
	mm/, security/, & sound/;
	many more drivers/ to go)
Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

sound/oss/i810_audio.c:3431: warning: label `out_pio' defined but not used

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>