From: Franz S. <Fra...@la...> - 2000-08-20 21:05:05
|
On Sun, 20 Aug 2000, Vojtech Pavlik wrote: > On Sun, Aug 20, 2000 at 03:43:23PM +0200, Franz Sirl wrote: > > On Sun, 20 Aug 2000, jsi...@ne... wrote: > > > > Any reason you don`t accept this patch? To me it looks like a > > > > obvious and clean solution and it would greatly simplify my use of > > > > the input infrastructure in my new driver for ADB input devices. > > > > Otherwise ugly Config.in and Makefile hacks will be necessary to > > > > select this driver in the drivers/usb directory if only CONFIG_ADB is > > > > set (same problem that already happens to the people trying to use > > > > joysticks without CONFIG_USB set). > > > > If you have any reason to reject that change (which essentially is > > > > just a move of files) for 2.4.0, please tell us. > > > > > > Yes it was rejected because of the massive moving of files. Linus feels > > > that ugly Config.in and Makefile hacks will do for now. > > > > Hmm, did Linus reject privately? I didn't see anything on linux-kernel. > > > > Well, OK. This will get really ugly when adbhid.c gets added with one of > > the next PPC merges and and drivers/usb has to be entered for > > CONFIG_ADB/CONFIG_INPUT_ADBHID too. Well, if that's the final word for > > 2.4.0... Can we schedule the move for 2.4.1 then? > > > > Who will send the joystick Makefile/Config.in patch to Linus? Please send > > it ASAP, I'll do the hackery for CONFIG_INPUT_ADBHID after that then. > > Unfortunately, to enter the USB dir, one needs to set CONFIG_USB, which > in return means that usbcore.o will get linked in or at least built as a > module even when not needed at all :( Nope, it's ugly, but possible. I just did it for the adbhid driver. See this diff: @@ -76,6 +71,13 @@ MOD_SUB_DIRS += usb endif endif + +ifeq ($(CONFIG_USB),) + ifeq ($(CONFIG_INPUT),y) + SUB_DIRS += usb + MOD_SUB_DIRS += usb + endif +endif ifeq ($(CONFIG_PHONE),y) SUB_DIRS += telephony I have a "define_bool CONFIG_INPUT y" in arch/ppc/config.in to forcibly enter drivers/usb if CONFIG_USB is unset. So you simply have to do the define_bool for the problematic joystick drivers too. This works fine so far. Should the PPC people start with the merge? We will have everything ready in our bitkeeper tree in a few minutes. Anyway, find appended ar tarball with the relevant files. You should get the idea and the diffs to test7-pre5 should be minimal. You can add the joystick diff and send a complete patch to Linus. Franz. |