diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:34 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:34 +0800 |
commit | 06c48e022c9737a840da15fd47c7df24dc5d5b9a (patch) | |
tree | b4dfddbb2c074254d747ba28b4fd9e1229082247 /drivers/input/misc/Makefile | |
parent | 416f7ed72d4a115d473df16bab92b46c5d120ef1 (diff) | |
parent | 56bde254da35de0eea481035bfcd50dbec3ea22f (diff) |
Merge topic branch 'st-mems-sensors' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
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 e9aa2d854bc..4c96bc978d9 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o obj-$(CONFIG_INPUT_KXTJ9) += kxtj9.o +obj-$(CONFIG_INPUT_LPS001WP) += lps001wp_prs.o obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o obj-$(CONFIG_INPUT_MAX8997_HAPTIC) += max8997_haptic.o |