diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 09:01:31 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 09:01:31 -0700 |
commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
tree | 556aa7b5cd6eeb4214dec129c789515157187010 /drivers/input/serio/Kconfig | |
parent | Input: tps6507x-ts - convert to polled input device infrastructure (diff) | |
parent | Input: cyttsp4 - SPI driver for Cypress TMA4XX touchscreen devices (diff) | |
download | linux-dev-27eb2c4b3d3e13f376a359e293c212a2e9407af5.tar.xz linux-dev-27eb2c4b3d3e13f376a359e293c212a2e9407af5.zip |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'drivers/input/serio/Kconfig')
-rw-r--r-- | drivers/input/serio/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 1bda828f4b55..94c17c28d268 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig @@ -256,4 +256,14 @@ config SERIO_APBPS2 To compile this driver as a module, choose M here: the module will be called apbps2. +config SERIO_OLPC_APSP + tristate "OLPC AP-SP input support" + depends on OF + help + Say Y here if you want support for the keyboard and touchpad included + in the OLPC XO-1.75 and XO-4 laptops. + + To compile this driver as a module, choose M here: the module will + be called olpc_apsp. + endif |