Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm21664.dtsi

diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi
index 3f525be28fd085370543a778bc3666e05506ff89..6dde95f21cef6b53c995b7311ddade7988dd965a 100644 (file)
--- a/arch/arm/boot/dts/bcm21664.dtsi
+++ b/arch/arm/boot/dts/bcm21664.dtsi
@@ -30,7 +30,6 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               enable-method = "brcm,bcm11351-cpu-method";
 
                cpu0: cpu@0 {
                        device_type = "cpu";
@@ -41,6 +40,7 @@
                cpu1: cpu@1 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
+                       enable-method = "brcm,bcm11351-cpu-method";
                        secondary-boot-reg = <0x35004178>;
                        reg = <1>;
                };