diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
| commit | 8494bd0e86271fb21581d27e3c5d6a369b5208ca (patch) | |
| tree | 65572b9ad90b016f8fcb7e1964f8536c7dc588f9 /drivers/i2c/busses/i2c-bcm2835.c | |
| parent | Merge tag 'kvm-s390-20131128' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | x86, xsave: Support eager-only xsave features, add MPX support (diff) | |
| download | linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.tar.xz linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.zip | |
Merge remote-tracking branch 'tip/x86/cpufeature' into kvm-next
Diffstat (limited to 'drivers/i2c/busses/i2c-bcm2835.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-bcm2835.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index d7e8600f31fb..77df97b932af 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -299,6 +299,7 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) strlcpy(adap->name, "bcm2835 I2C adapter", sizeof(adap->name)); adap->algo = &bcm2835_i2c_algo; adap->dev.parent = &pdev->dev; + adap->dev.of_node = pdev->dev.of_node; bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, 0); |