From 0559407398bb3f420f0366f5fc1fa8668a78bc82 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 22 Jun 2007 04:43:13 +0000 Subject: kernel version specific fixups for kmod packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7700 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'package/kernel') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 99ff481bc..18e711e0b 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -8,12 +8,18 @@ USBMENU:=USB Support -# This is 2.6.22 specific -#ifeq ($(KERNEL),2.4) - USBNET_DIR=usb/net -#else -# USBNET_DIR=net/usb -#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 define usbdep SUBMENU:=$(USBMENU) @@ -400,7 +406,7 @@ define KernelPackage/usb-hid endef define KernelPackage/usb-hid/2.6 - FILES:=$(LINUX_DIR)/drivers/usb/input/usbhid.ko + FILES:=$(LINUX_DIR)/$(USBHID_DIR)/usbhid.ko endef $(eval $(call KernelPackage,usb-hid)) -- cgit v1.2.3