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 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa5249.c
diff --git
a/drivers/media/video/saa5249.c
b/drivers/media/video/saa5249.c
index
f55d6e8
..
fde99d9
100644
(file)
--- a/
drivers/media/video/saa5249.c
+++ b/
drivers/media/video/saa5249.c
@@
-130,6
+130,7
@@
static struct video_device saa_template; /* Declared near bottom */
/* Addresses to scan */
static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
/* Addresses to scan */
static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
+
I2C_CLIENT_INSMOD;
static struct i2c_client client_template;
I2C_CLIENT_INSMOD;
static struct i2c_client client_template;
@@
-701,7
+702,9
@@
static const struct file_operations saa_fops = {
.open = saa5249_open,
.release = saa5249_release,
.ioctl = saa5249_ioctl,
.open = saa5249_open,
.release = saa5249_release,
.ioctl = saa5249_ioctl,
+#ifdef CONFIG_COMPAT
.compat_ioctl = v4l_compat_ioctl32,
.compat_ioctl = v4l_compat_ioctl32,
+#endif
.llseek = no_llseek,
};
.llseek = no_llseek,
};