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-parport-light.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-parport-light.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-parport-light.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c index b2b8380f6602..322c5691e38e 100644 --- a/drivers/i2c/busses/i2c-parport-light.c +++ b/drivers/i2c/busses/i2c-parport-light.c | |||
| @@ -115,7 +115,6 @@ static struct i2c_algo_bit_data parport_algo_data = { | |||
| 115 | static struct i2c_adapter parport_adapter = { | 115 | static struct i2c_adapter parport_adapter = { |
| 116 | .owner = THIS_MODULE, | 116 | .owner = THIS_MODULE, |
| 117 | .class = I2C_CLASS_HWMON, | 117 | .class = I2C_CLASS_HWMON, |
| 118 | .id = I2C_HW_B_LP, | ||
| 119 | .algo_data = &parport_algo_data, | 118 | .algo_data = &parport_algo_data, |
| 120 | .name = "Parallel port adapter (light)", | 119 | .name = "Parallel port adapter (light)", |
| 121 | }; | 120 | }; |