Add changes from the Linux-2.6 tree.

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

diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index c030c08..21a1de6 100644 (file)
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -8,10 +8,10 @@ obj-$(CONFIG_MOUSE_AMIGA)     += amimouse.o
 obj-$(CONFIG_MOUSE_RISCPC)     += rpcmouse.o
 obj-$(CONFIG_MOUSE_INPORT)     += inport.o
 obj-$(CONFIG_MOUSE_LOGIBM)     += logibm.o
-obj-$(CONFIG_MOUSE_MAPLE)      += maplemouse.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
 
-psmouse-objs  := psmouse-base.o logips2pp.o synaptics.o
+psmouse-objs  := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o trackpoint.o