git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[safe/jmp/linux-2.6]
/
arch
/
sh
/
Kconfig
diff --git
a/arch/sh/Kconfig
b/arch/sh/Kconfig
index
b4aa2a0
..
cb2c87d
100644
(file)
--- a/
arch/sh/Kconfig
+++ b/
arch/sh/Kconfig
@@
-121,6
+121,8
@@
config IO_TRAPPED
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
+
menu "System type"
#