diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-06 17:40:11 -0400 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /include/asm-x86/idle.h | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'include/asm-x86/idle.h')
| -rw-r--r-- | include/asm-x86/idle.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h index d240e5b30a45..cbb649123612 100644 --- a/include/asm-x86/idle.h +++ b/include/asm-x86/idle.h | |||
| @@ -10,4 +10,6 @@ void idle_notifier_register(struct notifier_block *n); | |||
| 10 | void enter_idle(void); | 10 | void enter_idle(void); |
| 11 | void exit_idle(void); | 11 | void exit_idle(void); |
| 12 | 12 | ||
| 13 | void c1e_remove_cpu(int cpu); | ||
| 14 | |||
| 13 | #endif | 15 | #endif |