Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv28518/linux/drivers/input
Modified Files:
Makefile
Added Files:
iforce-ff.c iforce-main.c iforce-packets.c iforce-serio.c
iforce-usb.c iforce.h
Removed Files:
iforce.c
Log Message:
Merged iforce-split back into the main trunk.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/Makefile,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile 2001/08/27 11:48:38 1.42
+++ Makefile 2001/10/16 21:05:57 1.43
@@ -28,6 +28,23 @@
hid-objs += hiddev.o
endif
+iforce-objs := iforce-packets.o iforce-ff.o iforce-main.o
+ifeq ($(CONFIG_INPUT_IFORCE_232), y)
+ iforce-objs += iforce-serio.o
+else
+ifeq ($(CONFIG_INPUT_IFORCE_232), m)
+ iforce-objs += iforce-serio.o
+endif
+endif
+
+ifeq ($(CONFIG_INPUT_IFORCE_USB), y)
+ iforce-objs += iforce-usb.o
+else
+ifeq ($(CONFIG_INPUT_IFORCE_USB), m)
+ iforce-objs += iforce-usb.o
+endif
+endif
+
# Object file lists.
obj-y :=
@@ -147,3 +164,6 @@
hid.o: $(hid-objs)
$(LD) -r -o $@ $(hid-objs)
+
+iforce.o: $(iforce-objs)
+ $(LD) -r -o $@ $(iforce-objs)
--- iforce.c DELETED ---
|
