diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-19 13:03:08 +0200 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /drivers/i2c/busses | |
parent | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (diff) | |
parent | 94c1acf2c85b03a59a42d931a94a13a76c123a62 (diff) | |
download | op-kernel-dev-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip op-kernel-dev-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.gz |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/i2c/busses')
-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 0ceb6e1..e3085c4 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) { |