Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285232
b: refs/heads/master
c: a824f0f
h: refs/heads/master
v: v3
  • Loading branch information
Jean Delvare authored and Mauro Carvalho Chehab committed Nov 24, 2011
1 parent 7c6fc01 commit 1b5e214
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a5006f68d6b336564eb1e4cbb1f66d234958889
refs/heads/master: a824f0f445ad2c86a40b4bf43acba26dfd0a98a9
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/au0828/au0828-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
}
}

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int au0828_i2c_register(struct au0828_dev *dev)
{
dprintk(1, "%s()\n", __func__);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/bt8xx/bttv-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
}
}

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int __devinit init_bttv_i2c(struct bttv *btv)
{
strlcpy(btv->i2c_client.name, "bttv internal", I2C_NAME_SIZE);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cx18/cx18-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static struct i2c_algo_bit_data cx18_i2c_algo_template = {
.timeout = CX18_ALGO_BIT_TIMEOUT*HZ /* jiffies */
};

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int init_cx18_i2c(struct cx18 *cx)
{
int i, err;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cx18/cx18-i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
int cx18_i2c_register(struct cx18 *cx, unsigned idx);
struct v4l2_subdev *cx18_find_hw(struct cx18 *cx, u32 hw);

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int init_cx18_i2c(struct cx18 *cx);
void exit_cx18_i2c(struct cx18 *cx);
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cx23885/cx23885-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c)
}
}

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int cx23885_i2c_register(struct cx23885_i2c *bus)
{
struct cx23885_dev *dev = bus->dev;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cx25821/cx25821-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static struct i2c_client cx25821_i2c_client_template = {
.name = "cx25821 internal",
};

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int cx25821_i2c_register(struct cx25821_i2c *bus)
{
struct cx25821_dev *dev = bus->dev;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/cx88/cx88-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static void do_i2c_scan(const char *name, struct i2c_client *c)
}
}

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
{
/* Prevents usage of invalid delay values */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/ivtv/ivtv-i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct i2c_client *ivtv_i2c_new_ir_legacy(struct ivtv *itv);
int ivtv_i2c_register(struct ivtv *itv, unsigned idx);
struct v4l2_subdev *ivtv_find_hw(struct ivtv *itv, u32 hw);

/* init + register i2c algo-bit adapter */
/* init + register i2c adapter */
int init_ivtv_i2c(struct ivtv *itv);
void exit_ivtv_i2c(struct ivtv *itv);

Expand Down

0 comments on commit 1b5e214

Please sign in to comment.