[Linuxconsole-commit]CVS: ruby/linux/drivers/input Makefile,1.48,1.49

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/drivers/input

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.18

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Makefile	27 Mar 2002 20:58:50 -0000	1.48
+++ Makefile	25 May 2002 20:32:03 -0000	1.49
@@ -22,26 +22,10 @@
 obj-$(CONFIG_INPUT_POWER)	+= power.o
 obj-$(CONFIG_INPUT_EVBUG)	+= evbug.o
 
-subdir-$(CONFIG_INPUT_JOYSTICK)	+= joystick
-subdir-$(CONFIG_INPUT_KEYBOARD)	+= keyboard
-subdir-$(CONFIG_INPUT_MOUSE)	+= mouse
-subdir-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen
-
-ifeq ($(CONFIG_INPUT_KEYBOARD),y)
-	obj-y += keyboard/keybdrv.o
-endif
-
-ifeq ($(CONFIG_INPUT_MOUSE),y)
-	obj-y += mouse/mousedrv.o
-endif
-
-ifeq ($(CONFIG_INPUT_JOYSTICK),y)
-	obj-y += joystick/joydrv.o
-endif
-
-ifeq ($(CONFIG_INPUT_TOUCHSCREEN),y)
-	obj-y += touchscreen/tsdrv.o
-endif
+obj-$(CONFIG_INPUT_KEYBOARD)	+= keyboard/
+obj-$(CONFIG_INPUT_MOUSE)	+= mouse/
+obj-$(CONFIG_INPUT_JOYSTICK)	+= joystick/
+obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touchscreen/
 
 # The global Rules.make.