diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 11:29:52 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 11:29:52 +0300 |
commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /sound/core/pcm_native.c | |
parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
download | linux-354d14b3f53cc749c5d26d4ba7280d1e931d6bc4.tar.xz |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r-- | sound/core/pcm_native.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index f91a439f675c..0db714e87a80 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -22,7 +22,6 @@ #include <linux/mm.h> #include <linux/file.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/time.h> #include <linux/pm_qos_params.h> #include <linux/uio.h> |