diff options
| author |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-20 23:56:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-20 23:56:06 -0800 |
| commit | e4ddc9cc62b40a8b08d02379064d5d8fd78e98bc (patch) | |
| tree | 190f0d721ce4f00fe016a526717ee3f5dee26962 /include | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | [ALSA] version 1.0.14rc1 (diff) | |
| download | linux-dev-e4ddc9cc62b40a8b08d02379064d5d8fd78e98bc.tar.xz linux-dev-e4ddc9cc62b40a8b08d02379064d5d8fd78e98bc.zip | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (30 commits)
[ALSA] version 1.0.14rc1
[ALSA] ac97: Identify CMI9761 chips.
[ALSA] ac97_codec - trivial fix for bit update functions
[ALSA] snd-ca0106: Fix typos.
[ALSA] snd-ca0106: Add new card variant.
[ALSA] sound: fix PCM substream list
[ALSA] sound: initialize rawmidi substream list
[ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2
[ALSA] Remove IRQF_DISABLED for shared PCI irqs
[ALSA] Fix invalid assignment of PCI revision
[ALSA] Fix races in PCM OSS emulation
[ALSA] hda-codec - fix typo in PCI IDs
[ALSA] ac97 - Fix potential negative array index
[ALSA] hda-codec - Verbose proc output for PCM parameters
[ALSA] hda-codec - Fix detection of supported sample rates
[ALSA] hda-codec - Fix model for ASUS V1j laptop
[ALSA] sound/core/control.c: remove dead code
[ALSA] hda-codec - Add model for HP q965
[ALSA] pcm core: fix silence_start calculations
[ALSA] hda-codec - Fix a typo
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/pcm_oss.h | 1 | ||||
| -rw-r--r-- | include/sound/version.h | 4 | ||||
| -rw-r--r-- | include/sound/ymfpci.h | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h index c854647b6f3c..1cd4f64cdf31 100644 --- a/include/sound/pcm_oss.h +++ b/include/sound/pcm_oss.h @@ -56,6 +56,7 @@ struct snd_pcm_oss_runtime { size_t mmap_bytes; char *buffer; /* vmallocated period */ size_t buffer_used; /* used length from period buffer */ + struct mutex params_lock; #ifdef CONFIG_SND_PCM_OSS_PLUGINS struct snd_pcm_plugin *plugin_first; struct snd_pcm_plugin *plugin_last; diff --git a/include/sound/version.h b/include/sound/version.h index 17137f3a3b6f..2949b9b991b5 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated by alsa/ksync script. */ -#define CONFIG_SND_VERSION "1.0.13" -#define CONFIG_SND_DATE " (Tue Nov 28 14:07:24 2006 UTC)" +#define CONFIG_SND_VERSION "1.0.14rc1" +#define CONFIG_SND_DATE " (Wed Dec 20 08:11:48 2006 UTC)" diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h index d41cda97e952..f3514ee96bd9 100644 --- a/include/sound/ymfpci.h +++ b/include/sound/ymfpci.h @@ -286,7 +286,7 @@ struct snd_ymfpci { int irq; unsigned int device_id; /* PCI device ID */ - unsigned int rev; /* PCI revision */ + unsigned char rev; /* PCI revision */ unsigned long reg_area_phys; void __iomem *reg_area_virt; struct resource *res_reg_area; @@ -345,7 +345,6 @@ struct snd_ymfpci { struct snd_kcontrol *spdif_pcm_ctl; int mode_dup4ch; int rear_opened; - int rear_swap; int spdif_opened; struct { u16 left; @@ -378,7 +377,7 @@ int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm); int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm); int snd_ymfpci_pcm_spdif(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm); int snd_ymfpci_pcm_4ch(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm); -int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int rear_swap); +int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch); int snd_ymfpci_timer(struct snd_ymfpci *chip, int device); #endif /* __SOUND_YMFPCI_H */ |