diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:49 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:49 -0400 |
| commit | d807500a2472445d05ce641bf09438e3d72eeb4f (patch) | |
| tree | 09523f2161c042c874264890c509417fb0681839 /include/sound | |
| parent | c7ccfd060fe38d1029db860199a04d9b3dd4694d (diff) | |
| parent | 8b22d943c34b616eefbd6d2f8f197a53b1f29fd0 (diff) | |
Merge branch 'topic/pcm-cleanup' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 40c5a6fa6bcd..e4f60076e6c4 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -364,7 +364,6 @@ struct snd_pcm_substream { | |||
| 364 | /* -- timer section -- */ | 364 | /* -- timer section -- */ |
| 365 | struct snd_timer *timer; /* timer */ | 365 | struct snd_timer *timer; /* timer */ |
| 366 | unsigned timer_running: 1; /* time is running */ | 366 | unsigned timer_running: 1; /* time is running */ |
| 367 | spinlock_t timer_lock; | ||
| 368 | /* -- next substream -- */ | 367 | /* -- next substream -- */ |
| 369 | struct snd_pcm_substream *next; | 368 | struct snd_pcm_substream *next; |
| 370 | /* -- linked substreams -- */ | 369 | /* -- linked substreams -- */ |