diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 06:05:39 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-02-20 06:05:39 (GMT) |
| commit | 2d9f0d964be94fd51c7303288c6f9c88bf2381fe (patch) | |
| tree | 2631c3e82abc145a6e9c8e2c18687833c71de012 /drivers/input/keyboard/Makefile | |
| parent | 9937c026820baabd1e908a9c1e6bdc846293000a (diff) | |
| parent | 005a69d632cd8694061c2dd27492fe874780b5ee (diff) | |
| download | linux-2d9f0d964be94fd51c7303288c6f9c88bf2381fe.tar.xz | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.9 merge window.
Diffstat (limited to 'drivers/input/keyboard/Makefile')
| -rw-r--r-- | drivers/input/keyboard/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 44e7600..49b1645 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o obj-$(CONFIG_KEYBOARD_EP93XX) += ep93xx_keypad.o +obj-$(CONFIG_KEYBOARD_GOLDFISH_EVENTS) += goldfish_events.o obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o obj-$(CONFIG_KEYBOARD_GPIO_POLLED) += gpio_keys_polled.o obj-$(CONFIG_KEYBOARD_TCA6416) += tca6416-keypad.o |