summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx27-3ds.dts
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-17 23:26:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-17 23:26:44 +0100
commit6bf6d1af86e7dec914f7916f2a00910650a73469 (patch)
tree7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/arm/boot/dts/imx27-3ds.dts
parent45a690f6bcd5506d9988d0d069811ac9380750ad (diff)
parent63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff)
downloadop-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.zip
op-kernel-dev-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.gz
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/arm/boot/dts/imx27-3ds.dts')
-rw-r--r--arch/arm/boot/dts/imx27-3ds.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx27-3ds.dts b/arch/arm/boot/dts/imx27-3ds.dts
index d3f8296..0a8978a 100644
--- a/arch/arm/boot/dts/imx27-3ds.dts
+++ b/arch/arm/boot/dts/imx27-3ds.dts
@@ -27,7 +27,7 @@
status = "okay";
};
- uart@1000a000 {
+ uart1: serial@1000a000 {
fsl,uart-has-rtscts;
status = "okay";
};
OpenPOWER on IntegriCloud