diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
| commit | a29fb94ff48cba620e1ac1317f5eef5920ead3ff (patch) | |
| tree | 2fb8e026712bdf7848ea400e25118f6a58824a02 /include/sound/pcm_oss.h | |
| parent | 52a7a5835173af61b9f6c3038212370d9717526f (diff) | |
| parent | dd3533eca859a6debb1565503ec03e68354e08e0 (diff) | |
Merge commit alsa/devel into topic/misc
Conflicts:
include/sound/version.h
Diffstat (limited to 'include/sound/pcm_oss.h')
| -rw-r--r-- | include/sound/pcm_oss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h index cc4e226f35fd..760c969d885d 100644 --- a/include/sound/pcm_oss.h +++ b/include/sound/pcm_oss.h | |||
| @@ -61,7 +61,7 @@ struct snd_pcm_oss_runtime { | |||
| 61 | struct snd_pcm_plugin *plugin_first; | 61 | struct snd_pcm_plugin *plugin_first; |
| 62 | struct snd_pcm_plugin *plugin_last; | 62 | struct snd_pcm_plugin *plugin_last; |
| 63 | #endif | 63 | #endif |
| 64 | unsigned int prev_hw_ptr_interrupt; | 64 | unsigned int prev_hw_ptr_period; |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | struct snd_pcm_oss_file { | 67 | struct snd_pcm_oss_file { |