diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:37 +0100 |
| commit | 397da2d0ab0d1398242622d80a74df7245395c63 (patch) | |
| tree | 51e01a67c653c67108f65d063b8b9cbfacf0b1a7 /arch/arm/boot/dts/at91sam9n12ek.dts | |
| parent | b8cb3750ce94d7610934465263850dcf40736bca (diff) | |
| parent | 4dff5c7b7093b19c19d3a100f8a3ad87cb7cd9e7 (diff) | |
Merge branch 'topic/core-fixes' into for-linus
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9n12ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index ca4ddf86817a..626c67d66626 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -215,7 +215,7 @@ }; panel: panel { - compatible = "qd,qd43003c0-40", "simple-panel"; + compatible = "qiaodian,qd43003c0-40", "simple-panel"; backlight = <&backlight>; power-supply = <&panel_reg>; #address-cells = <1>; |