diff options
| author | Vojtech Pavlik <vojtech@suse.cz> | 2002-07-11 20:49:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-07-11 20:49:19 -0700 |
| commit | 512bb1dc11086c7d73b5f3390f2bcea6087eb2ea (patch) | |
| tree | 17a4cb17aa4f2b8085dd372dc70fc88ca180d0a6 /drivers | |
| parent | 450903303e6464a8cee7e23ea5febc6d103a4204 (diff) | |
[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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/input/Makefile | 4 | ||||
| -rw-r--r-- | drivers/usb/input/pid.c | 19 |
2 files changed, 1 insertions, 22 deletions
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 387b89f25641..dc9f6e808b54 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -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 @@ endif 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 --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c index d9865cd03fbb..509ae388051b 100644 --- a/drivers/usb/input/pid.c +++ b/drivers/usb/input/pid.c @@ -39,10 +39,6 @@ #define DEBUG -MODULE_AUTHOR("Rodrigo Damazio <rdamazio@lsi.usp.br>"); -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 @@ int hid_pid_init(struct hid_device *hid) 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); - - |