Merge branch 'linus' into cpumask-for-linus

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / Makefile

diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 96f1dd8037f8dfa19562e8d7a200321b6e3c02d5..8c8a1f236e28cded7f6ade983da64c90445aa999 100644 (file)
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -4,19 +4,20 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_MOUSE_AMIGA)      += amimouse.o
-obj-$(CONFIG_MOUSE_APPLETOUCH) += appletouch.o
-obj-$(CONFIG_MOUSE_BCM5974)    += bcm5974.o
-obj-$(CONFIG_MOUSE_ATARI)      += atarimouse.o
-obj-$(CONFIG_MOUSE_RISCPC)     += rpcmouse.o
-obj-$(CONFIG_MOUSE_INPORT)     += inport.o
-obj-$(CONFIG_MOUSE_LOGIBM)     += logibm.o
-obj-$(CONFIG_MOUSE_PC110PAD)   += pc110pad.o
-obj-$(CONFIG_MOUSE_PS2)                += psmouse.o
-obj-$(CONFIG_MOUSE_SERIAL)     += sermouse.o
-obj-$(CONFIG_MOUSE_HIL)                += hil_ptr.o
-obj-$(CONFIG_MOUSE_VSXXXAA)    += vsxxxaa.o
-obj-$(CONFIG_MOUSE_GPIO)       += gpio_mouse.o
+obj-$(CONFIG_MOUSE_AMIGA)              += amimouse.o
+obj-$(CONFIG_MOUSE_APPLETOUCH)         += appletouch.o
+obj-$(CONFIG_MOUSE_BCM5974)            += bcm5974.o
+obj-$(CONFIG_MOUSE_ATARI)              += atarimouse.o
+obj-$(CONFIG_MOUSE_RISCPC)             += rpcmouse.o
+obj-$(CONFIG_MOUSE_INPORT)             += inport.o
+obj-$(CONFIG_MOUSE_LOGIBM)             += logibm.o
+obj-$(CONFIG_MOUSE_PC110PAD)           += pc110pad.o
+obj-$(CONFIG_MOUSE_PS2)                        += psmouse.o
+obj-$(CONFIG_MOUSE_PXA930_TRKBALL)     += pxa930_trkball.o
+obj-$(CONFIG_MOUSE_SERIAL)             += sermouse.o
+obj-$(CONFIG_MOUSE_HIL)                        += hil_ptr.o
+obj-$(CONFIG_MOUSE_VSXXXAA)            += vsxxxaa.o
+obj-$(CONFIG_MOUSE_GPIO)               += gpio_mouse.o
 
 psmouse-objs := psmouse-base.o synaptics.o