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-mv64xxx.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-mv64xxx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 9e8118d2fe64..eeda276f8f16 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
| @@ -527,7 +527,6 @@ mv64xxx_i2c_probe(struct platform_device *pd) | |||
| 527 | goto exit_unmap_regs; | 527 | goto exit_unmap_regs; |
| 528 | } | 528 | } |
| 529 | drv_data->adapter.dev.parent = &pd->dev; | 529 | drv_data->adapter.dev.parent = &pd->dev; |
| 530 | drv_data->adapter.id = I2C_HW_MV64XXX; | ||
| 531 | drv_data->adapter.algo = &mv64xxx_i2c_algo; | 530 | drv_data->adapter.algo = &mv64xxx_i2c_algo; |
| 532 | drv_data->adapter.owner = THIS_MODULE; | 531 | drv_data->adapter.owner = THIS_MODULE; |
| 533 | drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; | 532 | drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |