diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-10 08:29:47 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-10 08:29:47 +0400 |
| commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
| tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /drivers/media/video/pwc/pwc.h | |
| parent | 819ae6a389d4acfab9a7bb874fa1977aa464d14b (diff) | |
| parent | f4b9a988685da6386d7f9a72df3098bcc3270526 (diff) | |
| download | linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | drivers/media/video/pwc/pwc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 0be6f814f539..0b658dee05a4 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -29,7 +29,6 @@ #include <linux/usb.h> #include <linux/spinlock.h> #include <linux/wait.h> -#include <linux/smp_lock.h> #include <linux/version.h> #include <linux/mutex.h> #include <linux/mm.h> |