diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 12:30:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 12:30:08 -0400 |
| commit | 7dfb2d4069cc698da925327e8c2106852a0c77a2 (patch) | |
| tree | a4143d70c25365f21d46be44eda3bbb5eb98bc9f /include | |
| parent | 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 (diff) | |
| parent | 2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23 (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:
ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)
ALSA: hda - Fix ALC680 base model capture
ASoC: Remove DSP mode support for WM8776
ALSA: hda - Add quirk for Dell Vostro 1220
ALSA: riptide - Fix detection / load of firmware files
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/emu10k1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 6a664c3f7c1e..7dc97d12253c 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h | |||
| @@ -1707,6 +1707,7 @@ struct snd_emu10k1 { | |||
| 1707 | unsigned int card_type; /* EMU10K1_CARD_* */ | 1707 | unsigned int card_type; /* EMU10K1_CARD_* */ |
| 1708 | unsigned int ecard_ctrl; /* ecard control bits */ | 1708 | unsigned int ecard_ctrl; /* ecard control bits */ |
| 1709 | unsigned long dma_mask; /* PCI DMA mask */ | 1709 | unsigned long dma_mask; /* PCI DMA mask */ |
| 1710 | unsigned int delay_pcm_irq; /* in samples */ | ||
| 1710 | int max_cache_pages; /* max memory size / PAGE_SIZE */ | 1711 | int max_cache_pages; /* max memory size / PAGE_SIZE */ |
| 1711 | struct snd_dma_buffer silent_page; /* silent page */ | 1712 | struct snd_dma_buffer silent_page; /* silent page */ |
| 1712 | struct snd_dma_buffer ptb_pages; /* page table pages */ | 1713 | struct snd_dma_buffer ptb_pages; /* page table pages */ |