projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'serge-next' into next
[linux-2.6-block.git]
/
arch
/
blackfin
/
Kconfig
diff --git
a/arch/blackfin/Kconfig
b/arch/blackfin/Kconfig
index 8102c79aaa94044369612ab3a8dc3bb6e33aa807..29e71ed6b8a7fb9c5e4b8381244a4c3d5b1d47db 100644
(file)
--- a/
arch/blackfin/Kconfig
+++ b/
arch/blackfin/Kconfig
@@
-64,8
+64,11
@@
config HARDWARE_PM
depends on OPROFILE
source "init/Kconfig"
+
source "kernel/Kconfig.preempt"
+source "kernel/Kconfig.freezer"
+
menu "Blackfin Processor Options"
comment "Processor and Board Settings"