projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
vexpress-v2p-ca15_a7.dts
diff --git
a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 1fc405a9ecfb0a4e6cacd94ba9442d6ce75575fa..cf8071ad22d5fb5acfd1382f82d16e606c28e068 100644
(file)
--- a/
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@
-45,7
+45,6
@@
reg = <1>;
};
-/* A7s disabled till big.LITTLE patches are available...
cpu2: cpu@2 {
device_type = "cpu";
compatible = "arm,cortex-a7";
@@
-63,7
+62,6
@@
compatible = "arm,cortex-a7";
reg = <0x102>;
};
-*/
};
memory@80000000 {