diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /arch/arm/boot/dts/imx6q-gw51xx.dts | |
parent | ALSA: hda - add capture mute led support in led_power_filter (diff) | |
parent | ALSA: pcm: Add timestamp type to sw_params (diff) | |
download | linux-03fe805a098422d27cbbbad29a54ff1349da3622.tar.xz linux-03fe805a098422d27cbbbad29a54ff1349da3622.zip |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'arch/arm/boot/dts/imx6q-gw51xx.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-gw51xx.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-gw51xx.dts b/arch/arm/boot/dts/imx6q-gw51xx.dts index af4929aee075..0e1406e58eff 100644 --- a/arch/arm/boot/dts/imx6q-gw51xx.dts +++ b/arch/arm/boot/dts/imx6q-gw51xx.dts @@ -11,7 +11,7 @@ /dts-v1/; #include "imx6q.dtsi" -#include "imx6qdl-gw54xx.dtsi" +#include "imx6qdl-gw51xx.dtsi" / { model = "Gateworks Ventana i.MX6 Quad GW51XX"; |