diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/input/Kconfig | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/Kconfig')
| -rw-r--r-- | drivers/input/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 23e82e46656d..001b147c7f95 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "Input device support" | 5 | menu "Input device support" |
| 6 | depends on !S390 | 6 | depends on !S390 && !UML |
| 7 | 7 | ||
| 8 | config INPUT | 8 | config INPUT |
| 9 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT | 9 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT |