summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc8349emitxgp.dts
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-09 01:56:37 +0100
committerPaul Mundt <lethal@linux-sh.org>2012-01-09 01:56:37 +0100
commit04cf399640b7acfa9abe2eb7900cd934db8af697 (patch)
treef9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/powerpc/boot/dts/mpc8349emitxgp.dts
parentMerge branch 'rmobile-fixes-for-linus' into rmobile-latest (diff)
parentaudit: always follow va_copy() with va_end() (diff)
downloadlinux-04cf399640b7acfa9abe2eb7900cd934db8af697.tar.xz
linux-04cf399640b7acfa9abe2eb7900cd934db8af697.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts: arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8349emitxgp.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitxgp.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index eb732115f016..6cd044d8fb89 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -189,7 +189,7 @@
serial0: serial@4500 {
cell-index = <0>;
device_type = "serial";
- compatible = "ns16550";
+ compatible = "fsl,ns16550", "ns16550";
reg = <0x4500 0x100>;
clock-frequency = <0>; // from bootloader
interrupts = <9 0x8>;
@@ -199,7 +199,7 @@
serial1: serial@4600 {
cell-index = <1>;
device_type = "serial";
- compatible = "ns16550";
+ compatible = "fsl,ns16550", "ns16550";
reg = <0x4600 0x100>;
clock-frequency = <0>; // from bootloader
interrupts = <10 0x8>;