commit | a19aab5792e907175a0515388e3de4f27d107b9e | [log] [tgz] |
---|---|---|
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | Tue Nov 20 23:37:28 2012 +0100 |
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | Tue Nov 20 23:37:28 2012 +0100 |
tree | dbac71b0faecf4ef3e53d6f9fbfe9dfc26b06776 | |
parent | ecab7dd7a81a9667c5468ab19f98b2a73351c655 [diff] | |
parent | 70eeaf98453191e5aede957c0c2ece05cf1a0f23 [diff] |
Merge tag 'marvell-mvneta-fix-and-clk-support-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell Ethernet driver fix + clk support
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index ca1e031..2673ac7 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -46,6 +46,7 @@ clock-frequency = <250000000>; status = "okay"; }; + sata@d00a0000 { nr-ports = <2>; status = "okay";