summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-19 18:06:53 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-19 18:06:53 +0100
commit3b1209e7994c4d31ff9932a7f566ae1c96b3c443 (patch)
tree8de1c91735f207dbf646e374e849e7522acc710d
parent801e6a01d1814f589a1d26981106c8f66b3a0612 (diff)
parent7a87c8ab68d0343fd58bb1249219959a239501bf (diff)
downloadblackbird-op-linux-3b1209e7994c4d31ff9932a7f566ae1c96b3c443.tar.gz
blackbird-op-linux-3b1209e7994c4d31ff9932a7f566ae1c96b3c443.zip
Merge tag 'cleanup_for_v3.9_round3' of git://git.infradead.org/users/jcooper/linux into next/cleanup
mvebu cleanup vor v3.9 round3 - fix typo in mvebu clokc gating documentation. * tag 'cleanup_for_v3.9_round3' of git://git.infradead.org/users/jcooper/linux: ARM: mvebu: correct gated clock documentation
-rw-r--r--Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
index 7337005ef5e1..cffc93d97f54 100644
--- a/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
+++ b/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
@@ -89,7 +89,7 @@ ID Clock Peripheral
16 xor1 XOR DMA 1
17 crypto CESA engine
18 pex1 PCIe Cntrl 1
-19 ge1 Gigabit Ethernet 0
+19 ge1 Gigabit Ethernet 1
20 tdm Time Division Mplx
Required properties:
OpenPOWER on IntegriCloud