diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
commit | fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4 (patch) | |
tree | c5b460cfc60b16a7c6718ae2613bb1d9cb98e5b8 /arch/powerpc/boot/dts/xpedite5370.dts | |
parent | 56d37d85438df38e150282baafe52dcd588854c7 (diff) | |
parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
download | talos-obmc-linux-fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4.tar.gz talos-obmc-linux-fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4.zip |
Merge tag 'v3.13-rc3' into asoc-arizona
Linux 3.13-rc3
Diffstat (limited to 'arch/powerpc/boot/dts/xpedite5370.dts')
-rw-r--r-- | arch/powerpc/boot/dts/xpedite5370.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/xpedite5370.dts b/arch/powerpc/boot/dts/xpedite5370.dts index 11dbda10d756..cd0ea2b99362 100644 --- a/arch/powerpc/boot/dts/xpedite5370.dts +++ b/arch/powerpc/boot/dts/xpedite5370.dts @@ -545,14 +545,14 @@ tlu@2f000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x2f000 0x1000>; - interupts = <61 2 >; + interrupts = <61 2>; interrupt-parent = <&mpic>; }; tlu@15000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x15000 0x1000>; - interupts = <75 2>; + interrupts = <75 2>; interrupt-parent = <&mpic>; }; }; |