On Thu, Jul 11, 2002 at 10:09:07PM -0700, Greg KH wrote:
> On Thu, Jul 11, 2002 at 05:16:10PM +0200, Vojtech Pavlik wrote:
> > Hi!
> >
> > This cset is update of the HID drivers to the latest version, as a part
> > of the Input merge. It finally includes ForceFeedback support by Johann
> > Deneux, enabling ForceFeedback on new Logitech and Microsoft devices.
> >
> > Should apply to a recent Linus 2.5 tree.
>
> 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.
--
Vojtech Pavlik
SuSE Labs
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2002-07-12 10:27:35+02:00, [EMAIL PROTECTED]
Fix pid.c build when built as a module.
Makefile | 4 +---
pid.c | 19 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff -Nru a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
--- a/drivers/usb/input/Makefile Fri Jul 12 10:28:26 2002
+++ b/drivers/usb/input/Makefile Fri Jul 12 10:28:26 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 10:28:26 2002
+++ b/drivers/usb/input/pid.c Fri Jul 12 10:28:26 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 BitKeeper patch contains the following changesets:
1.649+
## Wrapped with gzip_uu ##
begin 664 bkpatch21863
M'XL(`"J3+CT``[65;4_;,!#'7]>?XB1>3!IKXG.<AT;JQ$89FP8",:&]F32Y
MMFFRIDD4N^V8\N'G)@P$K$,PR(.3.+[+WW<_7W;@W.@F':RJ'U;+C.S`Q\K8
M=>9'/,NLMY=J3OUS_656Y?C^K%MJ_&NU/YWY>UDM+W/M3864&*]V8=(!>
M<-UC+VN=#LX.#L^/WIT1,A[#?B;*F?ZB+8S'Q%;-2A3*[`F;%57IV4:49J&M
M\&2U:*^'MHQ2YO80XX"&48L1Y7$K42$*CEI1QI.(DRMA>W?DW_43(V*(#$=M
M&(112":`7L1'0)E/8Q\9($U9G`;A+F4II;#%+>PR&%+R'IYW$OM$PH?\)]2Y
M\B1,EWFA8)WILKNU(`P(6%1J66B/?`8W@P3)Z4U4R?"1&R%44/)VVRQ;U>2;
MM/I+,^W3[7?*;H<R;!EBQ-LXT$*R"S5%I:(D&#W5*Z,)BX.@Y30)0B=NUNC9
MWKRI1-;%]+[UL9CKB[S0O0.^"3*+>=)R#"AO488BYC&_2)02FD:/D'7;\8TR
M!TY$.Z"WVVP(?V;E6QE_6/F?3#GE">V@3^XA'SR$/,(P>!'DOV:YU:864H/L
MS$V'=Q?E$Q@VZ^YPN)[^(^!/@/]3`DB^D0ENKA/&NC9R[=]3VZ]*E]<762[_
MYS5J*29A7\_8XU-+88BC%\EM'[3<E*]<_0*C:]$(JZ^JV!L0%@HMC(6RVIQK
M#XY/)N='!]]?@RB5L^\'ND=5=2[JNKC<T-%7AP?IZ#[_!#0FG`$GDP`=#N'-
83TYF6L[-<C'6G".R44Q^`V[6S\Y'!P``
`
end
