diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /arch/ia64/kernel/palinfo.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/ia64/kernel/palinfo.c')
| -rw-r--r-- | arch/ia64/kernel/palinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index 6386f63c413e..859fb37ff49b 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c | |||
| @@ -959,7 +959,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) | |||
| 959 | } | 959 | } |
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | static int __devinit palinfo_cpu_callback(struct notifier_block *nfb, | 962 | static int palinfo_cpu_callback(struct notifier_block *nfb, |
| 963 | unsigned long action, | 963 | unsigned long action, |
| 964 | void *hcpu) | 964 | void *hcpu) |
| 965 | { | 965 | { |