Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv2713/drivers/char
Modified Files:
Makefile
Log Message:
Merge Linus' 2.5.4 release. Major change is the splitting of task_struct
into task_struct and struct thread_info.
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 29 Sep 2002 19:33:16 -0000 1.2
+++ Makefile 29 Oct 2002 00:52:50 -0000 1.3
@@ -25,7 +25,7 @@
misc.o pty.o random.o selection.o serial.o \
sonypi.o tty_io.o tty_ioctl.o generic_serial.o
-mod-subdirs := joystick ftape drm pcmcia
+mod-subdirs := ftape drm pcmcia
list-multi :=
@@ -167,15 +167,10 @@
obj-$(CONFIG_SERIAL_IPR) += generic_serial.o
subdir-$(CONFIG_RIO) += rio
-subdir-$(CONFIG_INPUT) += joystick
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o
-
-ifeq ($(CONFIG_INPUT),y)
-obj-y += joystick/js.o
-endif
obj-$(CONFIG_BUSMOUSE) += busmouse.o
obj-$(CONFIG_DTLK) += dtlk.o
|
