summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm2835.dtsi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-20 17:46:26 +0100
committerDavid S. Miller <davem@davemloft.net>2013-03-20 17:46:26 +0100
commit61816596d1c9026d0ecb20c44f90452c41596ffe (patch)
tree3027ed6dc62f71e14b9d525405747fa0eb8f074d /arch/arm/boot/dts/bcm2835.dtsi
parentnet: fix psock_fanout selftest hash collision (diff)
parentnet: fec: Define indexes as 'unsigned int' (diff)
downloadlinux-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.xz
linux-61816596d1c9026d0ecb20c44f90452c41596ffe.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector infrastructure change. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/bcm2835.dtsi')
-rw-r--r--arch/arm/boot/dts/bcm2835.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 4bf2a8774aa7..7e0481e2441a 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -105,7 +105,7 @@
compatible = "fixed-clock";
reg = <1>;
#clock-cells = <0>;
- clock-frequency = <150000000>;
+ clock-frequency = <250000000>;
};
};
};