diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 21:48:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 21:48:50 -0700 |
| commit | 70f2911ee4e66428c52c71c1fa31ff0c7775086e (patch) | |
| tree | 8475ded20ad00805fee504d22ae970c3f74b0a89 | |
| parent | 84fb69f7dc769e84bfa939a8677ba793aa30d092 (diff) | |
| parent | 08af64097d4c5cb17f9df4dadf80ed5f508db743 (diff) | |
| download | op-kernel-dev-70f2911ee4e66428c52c71c1fa31ff0c7775086e.zip op-kernel-dev-70f2911ee4e66428c52c71c1fa31ff0c7775086e.tar.gz | |
Merge tag 'renesas-r8a7779-multiplatform3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Third Round of Renesas ARM Based SoC r8a7779-multiplatform Updates
for v3.17" from Simon Horman:
- Consistently use tabs for indentation
* tag 'renesas-r8a7779-multiplatform3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: marzen: Consistently use tabs for indentation
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/r8a7779-marzen.dts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index 20b1768..5745555 100644 --- a/arch/arm/boot/dts/r8a7779-marzen.dts +++ b/arch/arm/boot/dts/r8a7779-marzen.dts @@ -112,17 +112,17 @@ }; &scif2 { - pinctrl-0 = <&scif2_pins>; - pinctrl-names = "default"; + pinctrl-0 = <&scif2_pins>; + pinctrl-names = "default"; - status = "okay"; + status = "okay"; }; &scif4 { - pinctrl-0 = <&scif4_pins>; - pinctrl-names = "default"; + pinctrl-0 = <&scif4_pins>; + pinctrl-names = "default"; - status = "okay"; + status = "okay"; }; &sdhi0 { |
