diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-03-09 00:30:55 +0100 |
commit | d15c22e78674f9a5bc0de0932a43abe1aafae303 (patch) | |
tree | 3e4198c44bd2d9184e91647346c66aa95e28f843 /drivers/video/intelfb/intelfb_i2c.c | |
parent | Input: psmouse - add newline to OLPC HGPK touchpad debugging (diff) | |
parent | Linux 2.6.29-rc7 (diff) | |
download | linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip |
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'drivers/video/intelfb/intelfb_i2c.c')
-rw-r--r-- | drivers/video/intelfb/intelfb_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c index 5d896b81f4e0..b3065492bb20 100644 --- a/drivers/video/intelfb/intelfb_i2c.c +++ b/drivers/video/intelfb/intelfb_i2c.c @@ -111,7 +111,6 @@ static int intelfb_setup_i2c_bus(struct intelfb_info *dinfo, "intelfb %s", name); chan->adapter.class = class; chan->adapter.owner = THIS_MODULE; - chan->adapter.id = I2C_HW_B_INTELFB; chan->adapter.algo_data = &chan->algo; chan->adapter.dev.parent = &chan->dinfo->pdev->dev; chan->algo.setsda = intelfb_gpio_setsda; |