diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:13:00 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:29 -0400 |
| commit | d805a78603bb489d71a12466e8f29c5e9837e50a (patch) | |
| tree | 12d7273a3cbd4f28e833232e9d884b6c3b7f904e /arch/um/Kconfig.um | |
| parent | bad3118fcdeb4b7b5bf18cb40b2548cf891646b2 (diff) | |
um: clean Kconfig up a bit
* kill duplicates with drivers/char/Kconfig
* take watchdog one into drivers/watchdog/Kconfig
* take mmapper to arch/um/Kconfig.um
* rename Kconfig.char menu to "UML Character Devices"
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/Kconfig.um')
| -rw-r--r-- | arch/um/Kconfig.um | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index b5e675e370c6..70fd690964e4 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um | |||
| @@ -148,5 +148,11 @@ config KERNEL_STACK_ORDER | |||
| 148 | be 1 << order pages. The default is OK unless you're running Valgrind | 148 | be 1 << order pages. The default is OK unless you're running Valgrind |
| 149 | on UML, in which case, set this to 3. | 149 | on UML, in which case, set this to 3. |
| 150 | 150 | ||
| 151 | config MMAPPER | ||
| 152 | tristate "iomem emulation driver" | ||
| 153 | help | ||
| 154 | This driver allows a host file to be used as emulated IO memory inside | ||
| 155 | UML. | ||
| 156 | |||
| 151 | config NO_DMA | 157 | config NO_DMA |
| 152 | def_bool y | 158 | def_bool y |