original_kernel/include/sound
David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	sound/core/memalloc.c
2008-10-11 12:39:35 -07:00
..
Kbuild
ac97_codec.h
ad1816a.h
ad1843.h ALSA: ALSA driver for SGI O2 audio board 2008-07-14 09:01:02 +02:00
ak4xxx-adda.h
ak4114.h
ak4117.h
ak4531_codec.h
asequencer.h
asound.h ALSA: Increase components array size 2008-10-10 13:41:53 +02:00
asound_fm.h
asoundef.h ALSA: IEC958 definition for consumer status channel update 2008-08-01 13:13:13 +02:00
control.h ALSA: make snd_ctl_elem_read() and snd_ctl_elem_write() static 2008-06-13 16:48:49 +02:00
core.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-10-11 12:39:35 -07:00
cs46xx.h
cs46xx_dsp_scb_types.h
cs46xx_dsp_spos.h
cs46xx_dsp_task_types.h
cs4231-regs.h ALSA: opti93x: add support for Opti93x codec in cs4231-lib 2008-06-13 16:47:33 +02:00
cs8403.h
cs8427.h
driver.h
emu10k1.h [ALSA] emu10k1 - Fix inverted Analog/Digital mixer switch on Audigy2 2008-06-02 11:45:53 +02:00
emu10k1_synth.h
emu8000.h
emu8000_reg.h
emux_legacy.h
emux_synth.h
es1688.h
gus.h
hda_hwdep.h
hdsp.h
hdspm.h
hwdep.h
i2c.h
info.h
initval.h
jack.h ALSA: Add jack reporting API 2008-07-29 21:32:03 +02:00
memalloc.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-10-11 12:39:35 -07:00
minors.h ALSA: Fix limit of 8 PCM devices in SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE 2008-08-01 13:37:15 +02:00
mixer_oss.h
mpu401.h
opl3.h
opl4.h
pcm-indirect.h
pcm.h ALSA: Allocate larger pages in sgbuf 2008-08-25 09:57:38 +02:00
pcm_oss.h
pcm_params.h
pt2258.h
pxa2xx-lib.h ALSA: Separate common pxa2xx-pcm code 2008-09-23 08:18:10 +02:00
rawmidi.h
sb.h ALSA: ALS4000 driver work, step 2 2008-08-25 09:57:48 +02:00
sb16_csp.h
seq_device.h
seq_kernel.h ALSA: remove CONFIG_KMOD from sound 2008-07-10 09:32:58 +02:00
seq_midi_emul.h
seq_midi_event.h
seq_oss.h
seq_oss_legacy.h
seq_virmidi.h
sfnt_info.h
snd_wavefront.h ALSA: wss_lib: rename cs4231.h into wss.h 2008-08-06 15:39:47 +02:00
soc-dapm.h ALSA: ASoC: Export dapm_reg_event() fully 2008-07-29 16:00:33 +02:00
soc-of-simple.h ALSA: ASoC: Make OpenFirmware helper include file conditional 2008-07-29 21:32:22 +02:00
soc.h ALSA: ASoC: convert use of uint to unsigned int 2008-07-29 21:32:29 +02:00
soundfont.h
sscape_ioctl.h
tea575x-tuner.h
tea6330t.h
timer.h
tlv.h
trident.h
uda1341.h [ALSA] remove CVS keywords 2008-05-27 15:56:20 +02:00
util_mem.h
version.h ALSA: Release v1.0.18rc3 2008-09-09 18:55:25 +02:00
vx_core.h ALSA: Kill snd_assert() in other places 2008-08-13 11:46:40 +02:00
wavefront.h
wss.h ALSA: wss_lib: use wss pcm code instead of ad1848 one 2008-08-06 15:39:56 +02:00
ymfpci.h