[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.15,1.16 adbmouse.c,1.1.1.1,NONE amigamouse.c,1.1.1.1,NONE atixlmouse.c,1.1.1.1,NONE logibusmouse.c,1.1.1.3,NONE msbusmouse.c,1.1.1.3,NONE pc110pad.c,1.1.1.4,NONE pc110pad.h,1.1.1.1,NONE qpmouse.c,1.1.1.3,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv13161/drivers/char

Modified Files:
	Makefile 
Removed Files:
	adbmouse.c amigamouse.c atixlmouse.c logibusmouse.c 
	msbusmouse.c pc110pad.c pc110pad.h qpmouse.c 
Log Message:
Merge with 2.5.26


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	29 Jan 2003 00:07:48 -0000	1.15
+++ Makefile	29 Jan 2003 01:46:47 -0000	1.16
@@ -156,8 +156,6 @@
 obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
 obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
 
-obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
-obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
 obj-$(CONFIG_PRINTER) += lp.o
 
 obj-$(CONFIG_BUSMOUSE) += busmouse.o
@@ -165,12 +163,7 @@
 obj-$(CONFIG_R3964) += n_r3964.o
 obj-$(CONFIG_APPLICOM) += applicom.o
 obj-$(CONFIG_SONYPI) += sonypi.o
-obj-$(CONFIG_MS_BUSMOUSE) += msbusmouse.o
-obj-$(CONFIG_82C710_MOUSE) += qpmouse.o
-obj-$(CONFIG_AMIGAMOUSE) += amigamouse.o
 obj-$(CONFIG_ATARIMOUSE) += atarimouse.o
-obj-$(CONFIG_ADBMOUSE) += adbmouse.o
-obj-$(CONFIG_PC110_PAD) += pc110pad.o
 obj-$(CONFIG_RTC) += rtc.o
 obj-$(CONFIG_EFI_RTC) += efirtc.o
 ifeq ($(CONFIG_PPC),)
@@ -236,4 +229,4 @@
 	sed -e 's/^static *//' $@.tmp > $@
 	rm $@.tmp
 
-endif
\ No newline at end of file
+endif

--- adbmouse.c DELETED ---

--- amigamouse.c DELETED ---

--- atixlmouse.c DELETED ---

--- logibusmouse.c DELETED ---

--- msbusmouse.c DELETED ---

--- pc110pad.c DELETED ---

--- pc110pad.h DELETED ---

--- qpmouse.c DELETED ---