diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 22:21:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 22:21:24 +0200 |
| commit | 7110879cf2afbfb7af79675f5ff109e63d631c25 (patch) | |
| tree | 2a6c930ae90ad44002d045b91d335df634a26bb4 /arch/m32r/kernel | |
| parent | Merge branch 'v28-timers-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | m32r: fix build due to notify_cpu_starting() change (diff) | |
| download | linux-7110879cf2afbfb7af79675f5ff109e63d631c25.tar.xz linux-7110879cf2afbfb7af79675f5ff109e63d631c25.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
m32r: fix build due to notify_cpu_starting() change
powerpc: fix linux-next build failure
Diffstat (limited to 'arch/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index fc2994811f15..39cb6da72dcb 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c @@ -40,6 +40,7 @@ */ #include <linux/module.h> +#include <linux/cpu.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/mm.h> |