diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
| commit | 710421cc7d295cc59eb2676fe2ba3bc3252c124e (patch) | |
| tree | 4aa11cd7ee64b394871195cb585f16700553f540 /sound/usb/format.c | |
| parent | d7ef64a9f9987b29e3d911369a9d40122d5be2dd (diff) | |
| parent | f686c74cc3e78349d16d46fc72807354574b1516 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
ASoC: core: Don't set "(null)" as a driver name
ALSA: hda - Use LPIB for ATI/AMD chipsets as default
Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
ASoC: Tegra: Fix compile when debugfs not enabled
ASoC: spdif-dit: Add missing MODULE_*
SOUND: OSS: Remove Au1550 driver.
ALSA: hda - add Intel Panther Point HDMI codec id
ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
ALSA: hda - Fix input-src parse in patch_analog.c
ASoC: davinci-mcasp: enable ping-pong SRAM buffers
ASoC: add iPAQ hx4700 machine driver
ASoC: Asahi Kasei AK4641 codec driver
ALSA: hda - Enable Realtek ALC269 codec input layer beep
ALSA: intel8x0m: enable AMD8111 modem
ALSA: HDA: Add jack detection for HDMI
ALSA: sound, core, pcm_lib: fix xrun_log
ASoC: Max98095: Move existing NULL check before pointer dereference.
ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
ALSA: usb-audio - Add support for USB X-Fi S51 Pro
...
Diffstat (limited to 'sound/usb/format.c')
| -rw-r--r-- | sound/usb/format.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index f079b5e2ab28..8d042dce0d16 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include "helper.h" | 30 | #include "helper.h" |
| 31 | #include "debug.h" | 31 | #include "debug.h" |
| 32 | #include "clock.h" | 32 | #include "clock.h" |
| 33 | #include "format.h" | ||
| 33 | 34 | ||
| 34 | /* | 35 | /* |
| 35 | * parse the audio format type I descriptor | 36 | * parse the audio format type I descriptor |