From 5ab8688864608e7f874eefd315c0d552c7f0827d Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 13 Aug 2006 23:40:09 +0200 Subject: [PATCH] --- yaml --- r: 36099 b: refs/heads/master c: 8241cb1401873e18bba746fd3f6c56ce4252a61f h: refs/heads/master i: 36097: cb1e0aee313ce2a2626ca412264b4cc7e688a150 36095: f12adeebc6aad58f98de2e5a45668d82e536b80e v: v3 --- [refs] | 2 +- trunk/drivers/video/matrox/i2c-matroxfb.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bff4d974832a..0e7daac8a596 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be53f9b2a08e647396ceaa004199ae4b032a9bd2 +refs/heads/master: 8241cb1401873e18bba746fd3f6c56ce4252a61f diff --git a/trunk/drivers/video/matrox/i2c-matroxfb.c b/trunk/drivers/video/matrox/i2c-matroxfb.c index 57abbae5520f..9842042d2af5 100644 --- a/trunk/drivers/video/matrox/i2c-matroxfb.c +++ b/trunk/drivers/video/matrox/i2c-matroxfb.c @@ -95,12 +95,13 @@ static struct i2c_adapter matrox_i2c_adapter_template = static struct i2c_algo_bit_data matrox_i2c_algo_template = { - NULL, - matroxfb_gpio_setsda, - matroxfb_gpio_setscl, - matroxfb_gpio_getsda, - matroxfb_gpio_getscl, - 10, 10, 100, + .setsda = matroxfb_gpio_setsda, + .setscl = matroxfb_gpio_setscl, + .getsda = matroxfb_gpio_getsda, + .getscl = matroxfb_gpio_getscl, + .udelay = 10, + .mdelay = 10, + .timeout = 100, }; static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,