linux/include/sound
Linus Torvalds 664a41b8a9 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
2011-07-30 00:08:53 -07:00
..
ac97_codec.h Fix common misspellings 2011-03-31 11:26:23 -03:00
aci.h
ad1816a.h
ad1843.h
ak4xxx-adda.h
ak4113.h ALSA: i2c: cleanup: change parameter to pointer 2010-04-04 12:21:39 +02:00
ak4114.h
ak4117.h
ak4531_codec.h
ak4641.h ASoC: Asahi Kasei AK4641 codec driver 2011-05-19 14:10:45 -07:00
alc5623.h ASoC: add support for alc562[123] codecs 2010-10-21 13:51:13 -07:00
asequencer.h
asound.h ALSA: pcm: support for period wakeup disabling 2010-11-22 08:13:16 +01:00
asound_fm.h
asoundef.h
atmel-abdac.h
atmel-ac97c.h
control.h Merge branch 'topic/misc' into for-linus 2011-05-22 10:01:29 +02:00
core.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-10-25 08:32:05 -07:00
cs46xx.h
cs46xx_dsp_scb_types.h
cs46xx_dsp_spos.h Fix common misspellings 2011-03-31 11:26:23 -03:00
cs46xx_dsp_task_types.h
cs4231-regs.h
cs4271.h ASoC: CS4271: Move Chip Select control out of the CODEC code. 2011-02-08 11:26:14 +00:00
cs8403.h
cs8427.h
emu10k1.h ALSA: emu10k1: Fix warning: "CCR" redefined 2010-10-18 07:45:44 +02:00
emu10k1_synth.h
emu8000.h
emu8000_reg.h
emux_legacy.h
emux_synth.h
es1688.h ALSA: Merge es1688 and es968 drivers 2010-05-10 09:49:30 +02:00
gus.h
hda_hwdep.h
hdsp.h ALSA: hdsp - Add support for RPM io box 2010-12-01 12:14:47 +01:00
hdspm.h Fix common misspellings 2011-03-31 11:26:23 -03:00
hwdep.h
i2c.h
info.h ALSA: info - Use standard types for info callbacks 2010-04-13 11:57:14 +02:00
initval.h
jack.h ALSA: Add more jack button slots 2010-09-07 08:04:38 +02:00
Kbuild include: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
l3.h
max98088.h ASoC: Restore MAX98088 CODEC driver 2010-10-18 16:46:27 -07:00
max98095.h ASoC: Add EQ and filter to max98095 CODEC driver 2011-04-20 13:50:41 +01:00
memalloc.h
minors.h ALSA: support module on-demand loading for seq and timer 2010-11-24 05:53:25 +01:00
mixer_oss.h ALSA: core: sparse cleanups 2011-02-14 17:10:11 +01:00
mpu401.h
opl3.h
opl4.h
pcm-indirect.h
pcm.h ALSA: Make pcm.h self-contained 2011-07-26 17:21:24 +02:00
pcm_oss.h
pcm_params.h ALSA: Make pcm.h self-contained 2011-07-26 17:21:24 +02:00
pt2258.h
pxa2xx-lib.h
rawmidi.h ALSA: rawmidi - Use workq for event handling 2011-06-14 14:37:06 +02:00
s3c24xx_uda134x.h
sb.h
sb16_csp.h ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size 2011-06-30 15:33:57 +02:00
seq_device.h
seq_kernel.h
seq_midi_emul.h
seq_midi_event.h
seq_oss.h
seq_oss_legacy.h
seq_virmidi.h
sfnt_info.h
sh_dac_audio.h
sh_fsi.h ASoC: sh: fsi: modify selection method of I2S/PCM/SPDIF format 2011-01-26 11:25:47 +00:00
snd_wavefront.h
soc-dai.h ASoC: core - Allow components to probe/remove in sequence. 2011-06-07 18:38:27 +01:00
soc-dapm.h ASoC: dapm - add DAPM macro for external enum widgets 2011-07-20 20:51:08 +01:00
soc.h ASoC: core - Add convenience register for platform kcontrol and DAPM 2011-07-05 11:07:41 -07:00
soundfont.h treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
tea575x-tuner.h [media] tea575x: allow multiple opens 2011-07-27 17:53:07 -03:00
tea6330t.h
timer.h
tlv.h ALSA: tlv - Define numbers in sound/tlv.h 2010-10-17 10:46:14 +02:00
tlv320aic3x.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
tlv320aic32x4.h ASoC: Add TI tlv320aic32x4 codec support. 2011-03-04 18:21:08 +00:00
tlv320dac33-plat.h ASoC: tlv320dac33: Update e-mail address 2011-05-11 16:12:35 +01:00
tpa6130a2-plat.h ASoC: tpa6130a2: Update e-mail address 2011-05-11 16:12:45 +01:00
trident.h
uda134x.h ASoC: uda134x: replace a macro with a value in platform struct. 2010-06-25 12:29:01 +01:00
uda1380.h
util_mem.h
version.h ALSA: Release v1.0.24 2011-01-27 13:10:36 +01:00
vx_core.h
wavefront.h
wm2000.h ASoC: Add WM2000 driver 2010-02-12 10:31:06 +00:00
wm8903.h Merge branch 'for-2.6.38' into for-2.6.39 2011-02-13 19:51:04 +00:00
wm8904.h ASoC: Support GPIO based microphone detection for WM8904 2010-03-16 16:03:30 +00:00
wm8915.h ASoC: Add WM8915 CODEC driver 2011-04-11 13:33:50 -07:00
wm8955.h
wm8960.h ASoC: Add support for WM8960 capless mode 2010-03-03 17:08:43 +00:00
wm8962.h ASoC: Define constants for WM8962 GPIO functions 2011-04-26 11:49:02 +01:00
wm8993.h
wm9081.h ASoC: Add platform data for WM9081 IRQ pin configuration 2011-03-01 23:30:53 +00:00
wm9090.h ASoC: Add WM9090 amplifier driver 2010-04-30 16:12:44 +01:00
wss.h
ymfpci.h