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/um/Kconfig | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/um/Kconfig')
| -rw-r--r-- | arch/um/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 6976812cfb18..393bccfe1785 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
| @@ -229,6 +229,8 @@ endmenu | |||
| 229 | 229 | ||
| 230 | source "init/Kconfig" | 230 | source "init/Kconfig" |
| 231 | 231 | ||
| 232 | source "kernel/Kconfig.freezer" | ||
| 233 | |||
| 232 | source "drivers/block/Kconfig" | 234 | source "drivers/block/Kconfig" |
| 233 | 235 | ||
| 234 | source "arch/um/Kconfig.char" | 236 | source "arch/um/Kconfig.char" |