diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/um/Kconfig.common | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/um/Kconfig.common')
| -rw-r--r-- | arch/um/Kconfig.common | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index 109ddc0071c6..a9234838e8a2 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common | |||
| @@ -7,7 +7,6 @@ config UML | |||
| 7 | bool | 7 | bool |
| 8 | default y | 8 | default y |
| 9 | select HAVE_GENERIC_HARDIRQS | 9 | select HAVE_GENERIC_HARDIRQS |
| 10 | select GENERIC_HARDIRQS_NO_DEPRECATED | ||
| 11 | select GENERIC_IRQ_SHOW | 10 | select GENERIC_IRQ_SHOW |
| 12 | 11 | ||
| 13 | config MMU | 12 | config MMU |