diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /drivers/base/topology.c | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
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 915810f6237e..8c52421cbc54 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) | |||
| 107 | return 0; | 107 | return 0; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, | 110 | static int topology_cpu_callback(struct notifier_block *nfb, |
| 111 | unsigned long action, void *hcpu) | 111 | unsigned long action, void *hcpu) |
| 112 | { | 112 | { |
| 113 | unsigned int cpu = (unsigned long)hcpu; | 113 | unsigned int cpu = (unsigned long)hcpu; |