diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-16 18:07:16 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-16 18:07:16 +0900 |
| commit | c9ac1361d2258a667672cf531cd840807daba4f1 (patch) | |
| tree | 134266f519bb79f33570ecf341fb028cbeb0ae80 /drivers/video/via/via_i2c.c | |
| parent | 53b5031430bb3a7941b340b453afe4eabeb5340c (diff) | |
| parent | 2563afa9ec6970f3545906382cc986ee012f60ec (diff) | |
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
Diffstat (limited to 'drivers/video/via/via_i2c.c')
| -rw-r--r-- | drivers/video/via/via_i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c index 3844b558b7b..78f1405dbab 100644 --- a/drivers/video/via/via_i2c.c +++ b/drivers/video/via/via_i2c.c @@ -32,7 +32,7 @@ */ #define VIAFB_NUM_I2C 5 static struct via_i2c_stuff via_i2c_par[VIAFB_NUM_I2C]; -struct viafb_dev *i2c_vdev; /* Passed in from core */ +static struct viafb_dev *i2c_vdev; /* Passed in from core */ static void via_i2c_setscl(void *data, int state) { @@ -209,7 +209,6 @@ static int create_i2c_bus(struct i2c_adapter *adapter, sprintf(adapter->name, "viafb i2c io_port idx 0x%02x", adap_cfg->ioport_index); adapter->owner = THIS_MODULE; - adapter->id = 0x01FFFF; adapter->class = I2C_CLASS_DDC; adapter->algo_data = algo; if (pdev) |