diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 18:23:27 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 18:23:27 +0900 |
| commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
| tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /arch/um/Kconfig.common | |
| parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
| parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'arch/um/Kconfig.common')
| -rw-r--r-- | arch/um/Kconfig.common | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index 049d048b070d..e351e14b4339 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common @@ -3,14 +3,10 @@ config DEFCONFIG_LIST option defconfig_list default "arch/$ARCH/defconfig" -# UML uses the generic IRQ subsystem -config GENERIC_HARDIRQS - bool - default y - config UML bool default y + select HAVE_GENERIC_HARDIRQS config MMU bool |