summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-30 12:11:46 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-30 12:11:46 +0000
commit4e8d66c06f5b47dd5fa6add644597bc2c381aa0f (patch)
tree14ed3b6dd1fca39b5e966d0dad2ca7e81bdcccbd
parentaf2420ac0951b6726c078a6af7820c8b5aa05037 (diff)
cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7789 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/usb.mk16
1 files changed, 6 insertions, 10 deletions
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 1add87557..12a55d75b 100644
--- 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_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)
+ USBNET_DIR:=usb/net
+ USBHID_DIR:=usb/input
USBINPUT_DIR:=usb/input
endif
+
+USBNET_DIR?=net/usb
+USBHID_DIR?=hid/usbhid
USBINPUT_DIR?=input/misc
define usbdep
@@ -411,7 +407,7 @@ define KernelPackage/usb-hid
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))