git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aca4ec4)
ARM: shmobile: koelsch: Remove duplicate i2c6 nodes
authorSimon Horman <horms+renesas@verge.net.au>
Mon, 9 Jun 2014 08:50:28 +0000 (17:50 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 17 Jun 2014 10:58:25 +0000 (19:58 +0900)
A second i2c6 node was a added by
05e234a187058ee ("ARM: shmobile: koelsch dts: Add VDD MPU regulator for
DVFS"). Merge this into the existing node.

Also shuffle i2c nodes so they are all together.

Cc: Gaku Inami <gaku.inami.xw@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7791-koelsch.dts patch | blob | history

diff --cc arch/arm/boot/dts/r8a7791-koelsch.dts
Simple merge
Pandora Kernel Repository