diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-02 17:21:25 +0300 |
| commit | f6d3125fa3c2f55ddf7cf69365c41089de6cfae6 (patch) | |
| tree | ff2bcb135ebf090d7b383d55123b621f4590632c /arch/arm/boot/dts/rk3288-veyron.dtsi | |
| parent | 2dc6a0303b89de4c92b44f5278d61b6b6c9c20eb (diff) | |
| parent | 36f8dafe52b0d0726edd5102900e37192f1d3c65 (diff) | |
| download | linux-f6d3125fa3c2f55ddf7cf69365c41089de6cfae6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/dsa/slave.c
net/dsa/slave.c simply had overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/rk3288-veyron.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 2fa7a0dc83f7..275c78ccc0f3 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -158,6 +158,7 @@ }; &hdmi { + ddc-i2c-bus = <&i2c5>; status = "okay"; }; |