From: Vojtech P. <vo...@su...> - 2000-08-21 07:11:30
|
On Sun, Aug 20, 2000 at 11:00:43PM +0200, Franz Sirl wrote: > 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. Ok, and in the main Makefile ... DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a ifeq ($(CONFIG_USB),) ifeq ($(CONFIG_INPUT),y) DRIVERS-Y += drivers/usb/usbdrv.o endif endif ifeq ($(CONFIG_USB),m) ifeq ($(CONFIG_INPUT),y) ....... and here it gets DAMN ugly ..... DRIVERS-$(CONFIG_I2O) += drivers/i2o/i2o.o DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o > 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. Nothing appended. :( -- Vojtech Pavlik SuSE Labs |