Merge branch 'depends/driver-core' into ux500/dt
Arnd Bergmann [Fri, 16 Mar 2012 19:15:48 +0000 (19:15 +0000)]
Conflicts:
drivers/base/cpu.c

1  2 
drivers/base/cpu.c
drivers/pci/xen-pcifront.c
drivers/pcmcia/ds.c
include/linux/hyperv.h
scripts/mod/file2alias.c

@@@ -240,10 -222,11 +241,13 @@@ int __cpuinit register_cpu(struct cpu *
        int error;
  
        cpu->node_id = cpu_to_node(num);
 +      memset(&cpu->dev, 0x00, sizeof(struct device));
        cpu->dev.id = num;
        cpu->dev.bus = &cpu_subsys;
 +      cpu->dev.release = cpu_device_release;
+ #ifdef CONFIG_ARCH_HAS_CPU_AUTOPROBE
+       cpu->dev.bus->uevent = arch_cpu_uevent;
+ #endif
        error = device_register(&cpu->dev);
        if (!error && cpu->hotpluggable)
                register_cpu_control(cpu);
Simple merge
Simple merge
Simple merge
Simple merge