diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/m32r | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/Kconfig | 2 | ||||
| -rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 00289c178f89..dbaed4a63815 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -42,6 +42,8 @@ config HZ | |||
| 42 | 42 | ||
| 43 | source "init/Kconfig" | 43 | source "init/Kconfig" |
| 44 | 44 | ||
| 45 | source "kernel/Kconfig.freezer" | ||
| 46 | |||
| 45 | 47 | ||
| 46 | menu "Processor type and features" | 48 | menu "Processor type and features" |
| 47 | 49 | ||
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 @@ | |||
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 43 | #include <linux/cpu.h> | ||
| 43 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 44 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
| 45 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |