projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
[powerpc.git]
/
drivers
/
media
/
video
/
vino.c
diff --git
a/drivers/media/video/vino.c
b/drivers/media/video/vino.c
index
d1e04f7
..
0c658b7
100644
(file)
--- a/
drivers/media/video/vino.c
+++ b/
drivers/media/video/vino.c
@@
-782,7
+782,7
@@
static int vino_i2c_add_bus(void)
static int vino_i2c_del_bus(void)
{
static int vino_i2c_del_bus(void)
{
- return i2c_
sgi_del_bus
(&vino_i2c_adapter);
+ return i2c_
del_adapter
(&vino_i2c_adapter);
}
static int i2c_camera_command(unsigned int cmd, void *arg)
}
static int i2c_camera_command(unsigned int cmd, void *arg)
@@
-2325,7
+2325,7
@@
static void vino_capture_tasklet(unsigned long channel) {
}
}
}
}
-static irqreturn_t vino_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t vino_interrupt(int irq, void *dev_id)
{
u32 ctrl, intr;
unsigned int fc_a, fc_b;
{
u32 ctrl, intr;
unsigned int fc_a, fc_b;
@@
-4390,7
+4390,7
@@
static int vino_ioctl(struct inode *inode, struct file *file,
// __initdata
static int vino_init_stage = 0;
// __initdata
static int vino_init_stage = 0;
-static struct file_operations vino_fops = {
+static
const
struct file_operations vino_fops = {
.owner = THIS_MODULE,
.open = vino_open,
.release = vino_close,
.owner = THIS_MODULE,
.open = vino_open,
.release = vino_close,