diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:19:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:19:55 -0400 |
| commit | 7eb1053fd00a8f0e2263697638e17da8a251aa74 (patch) | |
| tree | dcb9a521c2866d1d0c7c62503696819ead76961b /drivers/input/misc/Makefile | |
| parent | 03a3f695cb9776cfa7da5e8e6d34fd20dd56510e (diff) | |
| parent | 388bbcade41ee68d2d1ebb51a538380ea48ae599 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: usbtouchscreen - support bigger iNexio touchscreens
Input: ads7846 - return error on regulator_get() failure
Input: twl4030-vibra - correct the power down sequence
Input: enable onkey driver of max8925
Input: use ABS_CNT rather than (ABS_MAX + 1)
Diffstat (limited to 'drivers/input/misc/Makefile')
| -rw-r--r-- | drivers/input/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index f9f577031e0..71fe57d8023 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile | |||
| @@ -20,6 +20,7 @@ obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o | |||
| 20 | obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o | 20 | obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o |
| 21 | obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o | 21 | obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o |
| 22 | obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o | 22 | obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o |
| 23 | obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o | ||
| 23 | obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o | 24 | obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o |
| 24 | obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o | 25 | obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o |
| 25 | obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o | 26 | obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o |