diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-08-07 11:22:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-07 11:22:14 +0200 |
| commit | 376249cf57b4e5516ba88f8ed8d45272e793cfb9 (patch) | |
| tree | 9669fe20fbd1719c1e13c1b3136e767cc9f278a0 /arch/arm/boot | |
| parent | ARM: kirkwood: fix typo in Makefile.boot (diff) | |
| parent | i.MX27: Fix emma-prp and csi clocks. (diff) | |
| download | linux-dev-376249cf57b4e5516ba88f8ed8d45272e793cfb9.tar.xz linux-dev-376249cf57b4e5516ba88f8ed8d45272e793cfb9.zip | |
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
ARM i.MX fixes for 3.6-rc
* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
i.MX27: Fix emma-prp and csi clocks.
ARM: clk-imx31: Fix the keypad clock name
ARM: dts: imx27-3ds.dts: Fix serial console node
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx27-3ds.dts | 2 |
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 d3f8296e19e0..0a8978a40ece 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"; }; |