projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[cascardo/linux.git]
/
drivers
/
media
/
i2c
/
saa7115.c
diff --git
a/drivers/media/i2c/saa7115.c
b/drivers/media/i2c/saa7115.c
index
91e7522
..
24d2b76
100644
(file)
--- a/
drivers/media/i2c/saa7115.c
+++ b/
drivers/media/i2c/saa7115.c
@@
-46,7
+46,7
@@
#include <linux/videodev2.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
-#include <media/saa7115.h>
+#include <media/
i2c/
saa7115.h>
#include <asm/div64.h>
#define VRES_60HZ (480+16)