diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/i2c/busses/i2c-keywest.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/i2c/busses/i2c-keywest.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-keywest.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c index 37b49c2daf5f..eff5896ce865 100644 --- a/drivers/i2c/busses/i2c-keywest.c +++ b/drivers/i2c/busses/i2c-keywest.c | |||
| @@ -611,7 +611,6 @@ create_iface(struct device_node *np, struct device *dev) | |||
| 611 | 611 | ||
| 612 | for (i=0; i<nchan; i++) { | 612 | for (i=0; i<nchan; i++) { |
| 613 | struct keywest_chan* chan = &iface->channels[i]; | 613 | struct keywest_chan* chan = &iface->channels[i]; |
| 614 | u8 addr; | ||
| 615 | 614 | ||
| 616 | sprintf(chan->adapter.name, "%s %d", np->parent->name, i); | 615 | sprintf(chan->adapter.name, "%s %d", np->parent->name, i); |
| 617 | chan->iface = iface; | 616 | chan->iface = iface; |