git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
media
/
video
/
arv.c
diff --git
a/drivers/media/video/arv.c
b/drivers/media/video/arv.c
index
5c5e682
..
dbe0251
100644
(file)
--- a/
drivers/media/video/arv.c
+++ b/
drivers/media/video/arv.c
@@
-18,7
+18,9
@@
* 2003-09-01: Support w3cam by Takeo Takahashi
*/
* 2003-09-01: Support w3cam by Takeo Takahashi
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/init.h>
+#include <linux/devfs_fs_kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/errno.h>
@@
-29,7
+31,6
@@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/videodev.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/videodev.h>
-#include <media/v4l2-common.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
@@
-211,7
+212,7
@@
void init_iic(void)
ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */
ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */
ar_outl(0x0300, PLDI2CMOD); /* I2CMOD ACK/8b-data/7b-addr/auto */
ar_outl(0x1, PLDI2CACK); /* I2CACK ACK */
- /* I2C CLK */
+ /* I2C CLK */
/* 50MH-100k */
if (freq == 75) {
ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */
/* 50MH-100k */
if (freq == 75) {
ar_outl(369, PLDI2CFREQ); /* BCLK = 75MHz */