ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR

[linux-2.6-omap-h63xx.git] / drivers / base / topology.c

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 915810f6237eeca929235e1502983080989a3376..8c52421cbc545b54a6ce1c84c0cf1bf3f734c751 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -107,7 +107,7 @@ static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
        return 0;
 }
 
-static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
+static int topology_cpu_callback(struct notifier_block *nfb,
                unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;