summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra30.dtsi
diff options
context:
space:
mode:
authorAl Viro2014-12-09 02:39:29 +0100
committerAl Viro2014-12-09 02:39:29 +0100
commitba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch)
treec08504e4d2fa51ac91cef544f336d0169806c49f /arch/arm/boot/dts/tegra30.dtsi
parentMerge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentcopy_from_iter_nocache() (diff)
downloadkernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.gz
kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz
kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/arm/boot/dts/tegra30.dtsi')
-rw-r--r--arch/arm/boot/dts/tegra30.dtsi8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index aa6ccea13d30..b270b9e3d455 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -9,14 +9,6 @@
compatible = "nvidia,tegra30";
interrupt-parent = <&intc>;
- aliases {
- serial0 = &uarta;
- serial1 = &uartb;
- serial2 = &uartc;
- serial3 = &uartd;
- serial4 = &uarte;
- };
-
pcie-controller@00003000 {
compatible = "nvidia,tegra30-pcie";
device_type = "pci";