git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/cleanup' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-empress.c
diff --git
a/drivers/media/video/saa7134/saa7134-empress.c
b/drivers/media/video/saa7134/saa7134-empress.c
index
add1757
..
296788c
100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-empress.c
+++ b/
drivers/media/video/saa7134/saa7134-empress.c
@@
-22,6
+22,7
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/delay.h>
#include "saa7134-reg.h"
#include <linux/delay.h>
#include "saa7134-reg.h"