diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-19 22:05:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-19 22:05:39 -0800 |
| commit | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (patch) | |
| tree | 2631c3e82abc145a6e9c8e2c18687833c71de012 /drivers/input/Kconfig | |
| parent | Input: wacom - fix wacom_set_report retry logic (diff) | |
| parent | Input: cyttsp-spi - remove duplicate MODULE_ALIAS() (diff) | |
| download | linux-dev-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.tar.xz linux-dev-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.zip | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.9 merge window.
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 55f7e57d4e42..38b523a1ece0 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -3,7 +3,7 @@ # menu "Input device support" - depends on !S390 && !UML + depends on !UML config INPUT tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT |