diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /drivers/i2c/busses/i2c-sibyte.c | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/i2c/busses/i2c-sibyte.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sibyte.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c index 4ddefbf238e9..98b1ec489159 100644 --- a/drivers/i2c/busses/i2c-sibyte.c +++ b/drivers/i2c/busses/i2c-sibyte.c | |||
| @@ -155,7 +155,6 @@ static struct i2c_algo_sibyte_data sibyte_board_data[2] = { | |||
| 155 | static struct i2c_adapter sibyte_board_adapter[2] = { | 155 | static struct i2c_adapter sibyte_board_adapter[2] = { |
| 156 | { | 156 | { |
| 157 | .owner = THIS_MODULE, | 157 | .owner = THIS_MODULE, |
| 158 | .id = I2C_HW_SIBYTE, | ||
| 159 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | 158 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
| 160 | .algo = NULL, | 159 | .algo = NULL, |
| 161 | .algo_data = &sibyte_board_data[0], | 160 | .algo_data = &sibyte_board_data[0], |
| @@ -164,7 +163,6 @@ static struct i2c_adapter sibyte_board_adapter[2] = { | |||
| 164 | }, | 163 | }, |
| 165 | { | 164 | { |
| 166 | .owner = THIS_MODULE, | 165 | .owner = THIS_MODULE, |
| 167 | .id = I2C_HW_SIBYTE, | ||
| 168 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | 166 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
| 169 | .algo = NULL, | 167 | .algo = NULL, |
| 170 | .algo_data = &sibyte_board_data[1], | 168 | .algo_data = &sibyte_board_data[1], |