# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.637 -> 1.638
# drivers/usb/input/Makefile 1.7 -> 1.8
# drivers/usb/input/pid.c 1.1 -> 1.2
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/12 [EMAIL PROTECTED] 1.638
# [PATCH] Re: [bk patch] Big HID update
#
# > Hm, in building this, it looks like pid.c wants to be a separate module,
# > yet the Makefile tries to build it into the hid.o module. The linker
# > complains horribly when this happens :)
#
# Ok, I found the case. Patch attached.
# --------------------------------------------
#
diff -Nru a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
--- a/drivers/usb/input/Makefile Fri Jul 12 11:45:23 2002
+++ b/drivers/usb/input/Makefile Fri Jul 12 11:45:23 2002
@@ -6,6 +6,7 @@
hid-objs := hid-core.o
# Optional parts of multipart objects.
+
ifeq ($(CONFIG_USB_HIDDEV),y)
hid-objs += hiddev.o
endif
@@ -15,15 +16,12 @@
ifeq ($(CONFIG_HID_PID),y)
hid-objs += pid.o
endif
-
ifeq ($(CONFIG_LOGITECH_RUMBLE),y)
hid-objs += hid-lgff.o
endif
-
ifeq ($(CONFIG_LOGITECH_3D),y)
hid-objs += hid-lg3dff.o
endif
-
ifeq ($(CONFIG_HID_FF),y)
hid-objs += hid-ff.o
endif
diff -Nru a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
--- a/drivers/usb/input/pid.c Fri Jul 12 11:45:23 2002
+++ b/drivers/usb/input/pid.c Fri Jul 12 11:45:23 2002
@@ -39,10 +39,6 @@
#define DEBUG
-MODULE_AUTHOR("Rodrigo Damazio <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("USB PID(Physical Interface Device) Driver");
-MODULE_LICENSE("GPL");
-
#define CHECK_OWNERSHIP(i, hid_pid) \
((i) < FF_EFFECTS_MAX && i >= 0 && \
test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \
@@ -313,18 +309,3 @@
return 0;
}
-
-static int __init hid_pid_modinit(void)
-{
- return 0;
-}
-
-static void __exit hid_pid_modexit(void)
-{
-
-}
-
-module_init(hid_pid_modinit);
-module_exit(hid_pid_modexit);
-
-
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Gadgets, caffeine, t-shirts, fun stuff.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
