diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:13:53 +0200 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /drivers/i2c/busses/scx200_i2c.c | |
| parent | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.tar.xz linux-aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/i2c/busses/scx200_i2c.c')
| -rw-r--r-- | drivers/i2c/busses/scx200_i2c.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index cb3ef5ac99fd..8b65a5cf8251 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c @@ -71,12 +71,12 @@ static int scx200_i2c_getsda(void *data) */ static struct i2c_algo_bit_data scx200_i2c_data = { - NULL, - scx200_i2c_setsda, - scx200_i2c_setscl, - scx200_i2c_getsda, - scx200_i2c_getscl, - 10, 10, 100, /* waits, timeout */ + .setsda = scx200_i2c_setsda, + .setscl = scx200_i2c_setscl, + .getsda = scx200_i2c_getsda, + .getscl = scx200_i2c_getscl, + .udelay = 10, + .timeout = 100, }; static struct i2c_adapter scx200_i2c_ops = { |