diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 03:22:04 -0500 |
| commit | 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch) | |
| tree | aa2aac22a5b329b778a6771a87bbf1945ad49bbd /drivers/i2c/busses/i2c-amd756.c | |
| parent | d278c48435625cb6b7edcf6a547620768b175709 (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
Diffstat (limited to 'drivers/i2c/busses/i2c-amd756.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-amd756.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 36bee5b9c952..220f4a1eee1d 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
| @@ -298,7 +298,6 @@ static const struct i2c_algorithm smbus_algorithm = { | |||
| 298 | 298 | ||
| 299 | struct i2c_adapter amd756_smbus = { | 299 | struct i2c_adapter amd756_smbus = { |
| 300 | .owner = THIS_MODULE, | 300 | .owner = THIS_MODULE, |
| 301 | .id = I2C_HW_SMBUS_AMD756, | ||
| 302 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, | 301 | .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, |
| 303 | .algo = &smbus_algorithm, | 302 | .algo = &smbus_algorithm, |
| 304 | }; | 303 | }; |