summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-02-01 08:22:57 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2013-02-01 08:22:57 +0400
commitb5831174f9d3f12a492deda6374ca96f87b694f8 (patch)
tree96aa46239200021f9545bda5836f7e80a640d88b /arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
parent40a1ef95da85843696fc3ebe5fce39b0db32669f (diff)
parent88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff)
downloadlinux-b5831174f9d3f12a492deda6374ca96f87b694f8.tar.xz
Merge tag 'v3.8-rc6' into x86/urgent
Linux 3.8-rc6 Merged in order to add a documentation update versus new code in upstream. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts')
-rw-r--r--arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 1fc405a9ecfb..cf8071ad22d5 100644
--- 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 {