diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 09:39:08 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 09:39:08 -0500 |
| commit | 74293759002aa7db0179158c20676a034614577b (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /include/linux/cpu.h | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
Merge branch 'master' of /home/aia21/ntfs-2.6/
Diffstat (limited to 'include/linux/cpu.h')
| -rw-r--r-- | include/linux/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 0ed1d4853c69..d612b89dce33 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
| @@ -32,7 +32,7 @@ struct cpu { | |||
| 32 | }; | 32 | }; |
| 33 | 33 | ||
| 34 | extern int register_cpu(struct cpu *, int, struct node *); | 34 | extern int register_cpu(struct cpu *, int, struct node *); |
| 35 | extern struct sys_device *get_cpu_sysdev(int cpu); | 35 | extern struct sys_device *get_cpu_sysdev(unsigned cpu); |
| 36 | #ifdef CONFIG_HOTPLUG_CPU | 36 | #ifdef CONFIG_HOTPLUG_CPU |
| 37 | extern void unregister_cpu(struct cpu *, struct node *); | 37 | extern void unregister_cpu(struct cpu *, struct node *); |
| 38 | #endif | 38 | #endif |