diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
| commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
| tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /arch/arm/boot/dts/tegra124-venice2.dts | |
| parent | aa9d9be96d33d97488e1bdf13a144931a3fce08e (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.zip op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.tar.gz | |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/tegra124-venice2.dts')
| -rw-r--r-- | arch/arm/boot/dts/tegra124-venice2.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index 1300885..5c3f781 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -10,6 +10,7 @@ aliases { rtc0 = "/i2c@0,7000d000/pmic@40"; rtc1 = "/rtc@0,7000e000"; + serial0 = &uarta; }; memory { |
