diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-04 17:40:59 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-04 17:40:59 +0200 |
| commit | fc1a7fe8b6442a941a8af0cdcc9ff6b666707d60 (patch) | |
| tree | 72b1eb004577e84a563c16e5acbc8126794e772c /drivers/i2c | |
| parent | Linux 3.9-rc5 (diff) | |
| parent | ACPI / BGRT: Don't let users configure BGRT on non X86 systems (diff) | |
| download | wireguard-linux-fc1a7fe8b6442a941a8af0cdcc9ff6b666707d60.tar.xz wireguard-linux-fc1a7fe8b6442a941a8af0cdcc9ff6b666707d60.zip | |
Merge branch 'acpi-fixes' into fixes
* acpi-fixes:
ACPI / BGRT: Don't let users configure BGRT on non X86 systems
cpuidle / ACPI: recover percpu ACPI processor cstate
ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices()
ACPI / SPI: Use parent's ACPI_HANDLE() in acpi_register_spi_devices()
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 0ceb6e1b0f65..e3085c487ace 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -182,7 +182,6 @@ static int dw_i2c_probe(struct platform_device *pdev) adap->algo = &i2c_dw_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; - ACPI_HANDLE_SET(&adap->dev, ACPI_HANDLE(&pdev->dev)); r = i2c_add_numbered_adapter(adap); if (r) { |