summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra20-tamonten.dtsi
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-12-09 02:39:29 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-09 02:39:29 +0100
commitba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch)
treec08504e4d2fa51ac91cef544f336d0169806c49f /arch/arm/boot/dts/tegra20-tamonten.dtsi
parentMerge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentcopy_from_iter_nocache() (diff)
downloadlinux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz
linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/arm/boot/dts/tegra20-tamonten.dtsi')
-rw-r--r--arch/arm/boot/dts/tegra20-tamonten.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 80e7d386ce34..13d4e6185275 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -7,6 +7,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
+ serial0 = &uartd;
};
memory {