git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
boot
/
dts
/
fsl
/
mpc8548si-pre.dtsi
diff --git
a/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
b/arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
index 720422d83529092fd9237e8b4b1992522e9d6faa..fc1ce977422bddda2c29a0077cafc157a06b395d 100644
(file)
--- a/
arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
+++ b/
arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
@@
-33,6
+33,9
@@
*/
/dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
/ {
compatible = "fsl,MPC8548";
#address-cells = <2>;