diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/acpi/i2c_ec.c | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/acpi/i2c_ec.c')
| -rw-r--r-- | drivers/acpi/i2c_ec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c index 8338be0990bc..bb54b6cdb30b 100644 --- a/drivers/acpi/i2c_ec.c +++ b/drivers/acpi/i2c_ec.c | |||
| @@ -340,6 +340,7 @@ static int acpi_ec_hc_add(struct acpi_device *device) | |||
| 340 | smbus->adapter.owner = THIS_MODULE; | 340 | smbus->adapter.owner = THIS_MODULE; |
| 341 | smbus->adapter.algo = &acpi_ec_smbus_algorithm; | 341 | smbus->adapter.algo = &acpi_ec_smbus_algorithm; |
| 342 | smbus->adapter.algo_data = smbus; | 342 | smbus->adapter.algo_data = smbus; |
| 343 | smbus->adapter.dev.parent = &device->dev; | ||
| 343 | 344 | ||
| 344 | if (i2c_add_adapter(&smbus->adapter)) { | 345 | if (i2c_add_adapter(&smbus->adapter)) { |
| 345 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 346 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, |