diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 05:19:31 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-12-30 05:19:31 +0100 |
| commit | dece8ada993e1764a115bdff0f1effffaa5fc8dc (patch) | |
| tree | ba35b26bce046c3062bf13b2fd7611cf9265e66e /arch/powerpc/boot/dts/mpc5121.dtsi | |
| parent | powerpc: Fix endian issues in power7/8 machine check handler (diff) | |
| parent | Merge remote-tracking branch 'agust/merge' into merge (diff) | |
| download | linux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.tar.xz linux-dece8ada993e1764a115bdff0f1effffaa5fc8dc.zip | |
Merge branch 'merge' into next
Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/mpc5121.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc5121.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi index bd14c00e5146..2d7cb04ac962 100644 --- a/arch/powerpc/boot/dts/mpc5121.dtsi +++ b/arch/powerpc/boot/dts/mpc5121.dtsi @@ -77,7 +77,6 @@ compatible = "fsl,mpc5121-immr"; #address-cells = <1>; #size-cells = <1>; - #interrupt-cells = <2>; ranges = <0x0 0x80000000 0x400000>; reg = <0x80000000 0x400000>; bus-frequency = <66000000>; /* 66 MHz ips bus */ |