diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 10:17:29 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 10:17:29 +1000 |
commit | 42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea (patch) | |
tree | 1af6ca28b88e052f9603790b259278904d2936be /arch/powerpc/boot/dts/p1021mds.dts | |
parent | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (diff) | |
parent | c4b6a77663f5879de20561144716cfb675815e82 (diff) | |
download | blackbird-op-linux-42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea.tar.gz blackbird-op-linux-42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea.zip |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/p1021mds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/p1021mds.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/p1021mds.dts b/arch/powerpc/boot/dts/p1021mds.dts index 7fad2df25981..ad5b85269004 100644 --- a/arch/powerpc/boot/dts/p1021mds.dts +++ b/arch/powerpc/boot/dts/p1021mds.dts @@ -617,6 +617,7 @@ bus-frequency = <0>; fsl,qe-num-riscs = <1>; fsl,qe-num-snums = <28>; + status = "disabled"; /* no firmware loaded */ qeic: interrupt-controller@80 { interrupt-controller; |