diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 02:25:08 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 02:25:08 +0200 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /arch/arm/boot/dts/s5pv210.dtsi | |
| parent | Input: xpad - fix rumble on Xbox One controllers with 2015 firmware (diff) | |
| parent | Input: add HDMI CEC specific keycodes (diff) | |
| download | linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.xz linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.zip | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'arch/arm/boot/dts/s5pv210.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/s5pv210.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi index 8344a0ee2b86..ffc36bd24d2f 100644 --- a/arch/arm/boot/dts/s5pv210.dtsi +++ b/arch/arm/boot/dts/s5pv210.dtsi @@ -130,7 +130,7 @@ amba { #address-cells = <1>; #size-cells = <1>; - compatible = "arm,amba-bus"; + compatible = "simple-bus"; ranges; pdma0: dma@e0900000 { |