Merge branch 'linus' into cpus4096

[linux-2.6-omap-h63xx.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index 117f1b7405cfc92ff1c342d2d92a9f35c2e9cbb5..0c5b5ac36d8edc06bb6eb68975f8223e50631c05 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -49,7 +49,7 @@
        for_each_online_node(node)                      \
                if (nr_cpus_node(node))
 
-void arch_update_cpu_topology(void);
+int arch_update_cpu_topology(void);
 
 /* Conform to ACPI 2.0 SLIT distance definitions */
 #define LOCAL_DISTANCE         10