diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 02:44:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 02:44:20 -0400 |
| commit | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (patch) | |
| tree | a6ec8dac896c3ea3ac7b1bb0dce8728766afcf91 /drivers/input/touchscreen/Makefile | |
| parent | 18974369cfe23acf16d0fb79e0d1fba7a9a95ec0 (diff) | |
| parent | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (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: (68 commits)
Input: adp5589-keys - add support for the ADP5585 derivatives
Input: imx_keypad - add pm suspend and resume support
Input: force feedback - potential integer wrap in input_ff_create()
Input: tsc2007 - make sure that X plate resistance is specified
Input: serio_raw - fix memory leak when closing char device
Input: serio_raw - kick clients when disconnecting port
Input: serio_raw - explicitly mark disconnected ports as dead
Input: serio_raw - fix coding style issues
Input: serio_raw - use dev_*() for messages
Input: serio_raw - use bool for boolean data
Input: serio_raw - perform proper locking when adding clients to list
Input: serio_raw - rename serio_raw_list to serio_raw_client
Input: serio_raw - use kref instead of rolling out its own refcounting
Input: psmouse - switch to using dev_*() for messages
Input: wacom - correct max Y value on medium bamboos
Input: wacom - add ABS_DISTANCE to Bamboo Pen reports
Input: wacom - remove unneeded touch pressure initialization
Input: lm8323 - wrap suspend and resume in CONFIG_PM_SLEEP
Input: ad7879-i2c - wrap suspend and resume in CONFIG_PM_SLEEP
Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP
...
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
| -rw-r--r-- | drivers/input/touchscreen/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 282d6f76ae26..f957676035a4 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile | |||
| @@ -46,6 +46,7 @@ obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += tnetv107x-ts.o | |||
| 46 | obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o | 46 | obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o |
| 47 | obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o | 47 | obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o |
| 48 | obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o | 48 | obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o |
| 49 | obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o | ||
| 49 | obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o | 50 | obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o |
| 50 | obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o | 51 | obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o |
| 51 | obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o | 52 | obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o |