aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 01:13:01 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 01:13:01 -0700
commite644dae645e167d154c0526358940986682a72b0 (patch)
tree972993c6568085b8d407fc7e13de10f4b93c651d /drivers/input/mouse/Makefile
parentInput: synaptics - fix regression with "image sensor" trackpads (diff)
parentInput: matrix-keymap - fix building keymaps (diff)
downloadlinux-dev-e644dae645e167d154c0526358940986682a72b0.tar.xz
linux-dev-e644dae645e167d154c0526358940986682a72b0.zip
Merge branch 'next' into for-linus
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 4718effeb8d9..46ba7556fd4f 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_MOUSE_GPIO) += gpio_mouse.o
obj-$(CONFIG_MOUSE_INPORT) += inport.o
obj-$(CONFIG_MOUSE_LOGIBM) += logibm.o
obj-$(CONFIG_MOUSE_MAPLE) += maplemouse.o
+obj-$(CONFIG_MOUSE_NAVPOINT_PXA27x) += navpoint.o
obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o
obj-$(CONFIG_MOUSE_PS2) += psmouse.o
obj-$(CONFIG_MOUSE_PXA930_TRKBALL) += pxa930_trkball.o