diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 08:54:56 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 08:54:56 -0500 |
| commit | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch) | |
| tree | d2295a923fabb1b01b25bb015c4c2e42ee9df5ca /drivers/i2c/busses/i2c-hydra.c | |
| parent | 858770619debfb9269add63e4ba8b7c6b5538dd1 (diff) | |
| parent | 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff) | |
Merge branch 'core/xen' into x86/urgent
Diffstat (limited to 'drivers/i2c/busses/i2c-hydra.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-hydra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c index 648aa7baff83..bec9b845dd16 100644 --- a/drivers/i2c/busses/i2c-hydra.c +++ b/drivers/i2c/busses/i2c-hydra.c | |||
| @@ -102,7 +102,6 @@ static struct i2c_algo_bit_data hydra_bit_data = { | |||
| 102 | static struct i2c_adapter hydra_adap = { | 102 | static struct i2c_adapter hydra_adap = { |
| 103 | .owner = THIS_MODULE, | 103 | .owner = THIS_MODULE, |
| 104 | .name = "Hydra i2c", | 104 | .name = "Hydra i2c", |
| 105 | .id = I2C_HW_B_HYDRA, | ||
| 106 | .algo_data = &hydra_bit_data, | 105 | .algo_data = &hydra_bit_data, |
| 107 | }; | 106 | }; |
| 108 | 107 | ||