aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:49 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:49 +0100
commitd807500a2472445d05ce641bf09438e3d72eeb4f (patch)
tree09523f2161c042c874264890c509417fb0681839 /include/sound
parentc7ccfd060fe38d1029db860199a04d9b3dd4694d (diff)
parent8b22d943c34b616eefbd6d2f8f197a53b1f29fd0 (diff)
downloadkernel_goldelico_gta04-d807500a2472445d05ce641bf09438e3d72eeb4f.zip
kernel_goldelico_gta04-d807500a2472445d05ce641bf09438e3d72eeb4f.tar.gz
kernel_goldelico_gta04-d807500a2472445d05ce641bf09438e3d72eeb4f.tar.bz2
Merge branch 'topic/pcm-cleanup' into for-linus
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 40c5a6f..e4f6007 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -364,7 +364,6 @@ struct snd_pcm_substream {
/* -- timer section -- */
struct snd_timer *timer; /* timer */
unsigned timer_running: 1; /* time is running */
- spinlock_t timer_lock;
/* -- next substream -- */
struct snd_pcm_substream *next;
/* -- linked substreams -- */