aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/mouse/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:40:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 16:40:59 -0700
commit3d6eadcb5008beca1b289983ffd7771d1e947bac (patch)
tree2a765d732c67173d323e903da67db12282ad597a /drivers/input/mouse/Makefile
parenta483ab1dddf86a0e8924e94cf838eed602602b39 (diff)
parent2a0bd75e5e687a9c34921e942c18477ea7ec2d63 (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: psmouse - add support for Elantech touchpads Input: i8042 - add Blue FB5601 to noloop exception table
Diffstat (limited to 'drivers/input/mouse/Makefile')
-rw-r--r--drivers/input/mouse/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 8e6e6909780..96f1dd8037f 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_MOUSE_GPIO) += gpio_mouse.o
psmouse-objs := psmouse-base.o synaptics.o
psmouse-$(CONFIG_MOUSE_PS2_ALPS) += alps.o
+psmouse-$(CONFIG_MOUSE_PS2_ELANTECH) += elantech.o
psmouse-$(CONFIG_MOUSE_PS2_OLPC) += hgpk.o
psmouse-$(CONFIG_MOUSE_PS2_LOGIPS2PP) += logips2pp.o
psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK) += lifebook.o