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/blackfin/Kconfig | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/blackfin/Kconfig')
| -rw-r--r-- | arch/blackfin/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 8102c79aaa94..29e71ed6b8a7 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -64,8 +64,11 @@ config HARDWARE_PM | |||
| 64 | depends on OPROFILE | 64 | depends on OPROFILE |
| 65 | 65 | ||
| 66 | source "init/Kconfig" | 66 | source "init/Kconfig" |
| 67 | |||
| 67 | source "kernel/Kconfig.preempt" | 68 | source "kernel/Kconfig.preempt" |
| 68 | 69 | ||
| 70 | source "kernel/Kconfig.freezer" | ||
| 71 | |||
| 69 | menu "Blackfin Processor Options" | 72 | menu "Blackfin Processor Options" |
| 70 | 73 | ||
| 71 | comment "Processor and Board Settings" | 74 | comment "Processor and Board Settings" |