diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 01:42:26 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 01:42:26 +0100 |
commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
tree | 032f067d3af458527d903a7653885404ed82431e /drivers/base/topology.c | |
parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/topology.c')
-rw-r--r-- | drivers/base/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 915810f6237..8c52421cbc5 100644 --- 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; |