[PATCH] hiddev.c in 2.4.10-pre9

From: Philipp Matthias Hahn (pmhahn@titan.lahn.de)
Date: Sun Sep 16 2001 - 02:49:50 EST

Hello USB-ML, LKML!

Since 2.4.10-pre9 includes part
 - Alan Cox: merge input/joystick layer differences...
USB HID / non-input device driver support doesn't work anymore:

linux-2.4.10-pre9/drivers/usb/Config.in:55
dep_tristate ' USB HID / non-input device driver support' CONFIG_USB_HIDDEV $CONFIG_USB $CONFIG_USB_HID

linux-2.4.10-pre9/drivers/usb/Makefile:35
ifeq ($(CONFIG_USB_HIDDEV),y)
        hid-objs += hiddev.o
endif

As soon as HID is compiled as a module CONFIG_USB_HIDDEV gets 'm' also and
will not be compiled and included in the kernel build. The old patch had a
simple line in drivers/usb/Makefile
obj-$(CONFIG_USB_HIDDEV) += hiddev.o

As it looks to me, hiddev.o can't be compiled as a module any longer, thus
drivers/usb/Config.in looks wrong and should be changed to:

--- linux-2.4.10-pre9/drivers/usb/Config.in~ Sun Sep 16 09:44:53 2001
+++ linux-2.4.10-pre9/drivers/usb/Config.in Sun Sep 16 09:47:49 2001
@@ -52,7 +52,9 @@
          dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
       fi
       dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
- dep_tristate ' USB HID / non-input device driver support' CONFIG_USB_HIDDEV $CONFIG_USB $CONFIG_USB_HID
+ if [ "$CONFIG_USB_HID" != "n" ]; then
+ bool ' USB HID / non-input device driver support' CONFIG_USB_HIDDEV
+ fi
    fi

    comment 'USB Imaging devices'

BYtE
Philipp 

-- 
  / /  (_)__  __ ____  __ Philipp Hahn
 / /__/ / _ \/ // /\ \/ /
/____/_/_//_/\_,_/ /_/\_\ pmhahn@titan.lahn.de

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sun Sep 23 2001 - 21:00:13 EST