diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 06:01:51 -0500 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /drivers/i2c/busses/i2c-sibyte.c | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
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], |