cleanup

[openwrt/svn-archive/archive.git] / package / kernel / modules / usb.mk

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 1add87557e8146f4ea6629544335fe1779279480..12a55d75b8a4cf95d9438f97c5c3ea5226e6d664 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -11,19 +11,15 @@ USBMENU:=USB Support
 ifeq ($(KERNEL),2.4)
   USBNET_DIR:=usb/net
 endif
 ifeq ($(KERNEL),2.4)
   USBNET_DIR:=usb/net
 endif

-ifeq ($(KERNEL_PATCHVER),2.6.21)
-  USBNET_DIR:=usb/net
-endif
-USBNET_DIR?=net/usb
-
-ifeq ($(KERNEL_PATCHVER),2.6.21)
-  USBHID_DIR:=drivers/usb/input
-endif
-USBHID_DIR?=drivers/hid/usbhid

 
 ifeq ($(KERNEL_PATCHVER),2.6.21)
 
 ifeq ($(KERNEL_PATCHVER),2.6.21)

+  USBNET_DIR:=usb/net
+  USBHID_DIR:=usb/input

   USBINPUT_DIR:=usb/input
 endif
   USBINPUT_DIR:=usb/input
 endif

+
+USBNET_DIR?=net/usb
+USBHID_DIR?=hid/usbhid

 USBINPUT_DIR?=input/misc
 
 define usbdep
 USBINPUT_DIR?=input/misc
 
 define usbdep


@@ -411,7 +407,7 @@ define KernelPackage/usb-hid
 endef
 
 define KernelPackage/usb-hid/2.6
 endef
 
 define KernelPackage/usb-hid/2.6

-  FILES:=$(LINUX_DIR)/$(USBHID_DIR)/usbhid.ko
+  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko

 endef
 $(eval $(call KernelPackage,usb-hid))
 
 endef
 $(eval $(call KernelPackage,usb-hid))