Commit 512bb1dc authored by Vojtech Pavlik's avatar Vojtech Pavlik Committed by Greg Kroah-Hartman

[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.
parent 45090330
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
hid-objs := hid-core.o hid-objs := hid-core.o
# Optional parts of multipart objects. # Optional parts of multipart objects.
ifeq ($(CONFIG_USB_HIDDEV),y) ifeq ($(CONFIG_USB_HIDDEV),y)
hid-objs += hiddev.o hid-objs += hiddev.o
endif endif
...@@ -15,15 +16,12 @@ endif ...@@ -15,15 +16,12 @@ endif
ifeq ($(CONFIG_HID_PID),y) ifeq ($(CONFIG_HID_PID),y)
hid-objs += pid.o hid-objs += pid.o
endif endif
ifeq ($(CONFIG_LOGITECH_RUMBLE),y) ifeq ($(CONFIG_LOGITECH_RUMBLE),y)
hid-objs += hid-lgff.o hid-objs += hid-lgff.o
endif endif
ifeq ($(CONFIG_LOGITECH_3D),y) ifeq ($(CONFIG_LOGITECH_3D),y)
hid-objs += hid-lg3dff.o hid-objs += hid-lg3dff.o
endif endif
ifeq ($(CONFIG_HID_FF),y) ifeq ($(CONFIG_HID_FF),y)
hid-objs += hid-ff.o hid-objs += hid-ff.o
endif endif
......
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
#define DEBUG #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) \ #define CHECK_OWNERSHIP(i, hid_pid) \
((i) < FF_EFFECTS_MAX && i >= 0 && \ ((i) < FF_EFFECTS_MAX && i >= 0 && \
test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \ test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \
...@@ -313,18 +309,3 @@ int hid_pid_init(struct hid_device *hid) ...@@ -313,18 +309,3 @@ int hid_pid_init(struct hid_device *hid)
return 0; 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);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment