Merge branch 'driver-core-next' into Linux 3.2

This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b22a83a91cb8..b088e985bee2 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1462,7 +1462,7 @@ int arch_update_cpu_topology(void)
 {
         int cpu, nid, old_nid;
         unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
-        struct sys_device *sysdev;
+        struct device *dev;
 
         for_each_cpu(cpu,&cpu_associativity_changes_mask) {
                 vphn_get_associativity(cpu, associativity);
@@ -1483,9 +1483,9 @@ int arch_update_cpu_topology(void)
                 register_cpu_under_node(cpu, nid);
                 put_online_cpus();
 
-                sysdev = get_cpu_sysdev(cpu);
-                if (sysdev)
-                        kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+                dev = get_cpu_device(cpu);
+                if (dev)
+                        kobject_uevent(&dev->kobj, KOBJ_CHANGE);
         }
 
         return 1;