diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-11 19:39:30 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-11 19:39:30 +0000 |
| commit | 24a6afd4e71d33970b66d799594c5f9aa1c2a090 (patch) | |
| tree | 027aa249f88b1137469063fb4bc9e8eb967c3b69 /package/kernel | |
| parent | f9840c8bfeb763d019d21f839f4215863d9d8546 (diff) | |
kernel: modules names changed with kernel 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22139 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/pcmcia.mk | 7 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index e782e7b239..1c01a04fe8 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -54,10 +54,17 @@ define KernelPackage/pcmcia-yenta KCONFIG:= \ CONFIG_PCCARD_NONSTATIC \ CONFIG_YENTA +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) + FILES:= \ + $(LINUX_DIR)/drivers/pcmcia/pcmcia_rsrc.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,pcmcia_rsrc yenta_socket) +else FILES:= \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket) +endif endef $(eval $(call KernelPackage,pcmcia-yenta)) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 6af3ea8435..4790ff9774 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -125,10 +125,17 @@ define KernelPackage/usb-audio CONFIG_SND_USB_AUDIO $(call AddDepends/usb) $(call AddDepends/sound) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) + FILES:= \ + $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ + $(LINUX_DIR)/sound/usb/snd-usb-audio.ko + AUTOLOAD:=$(call AutoLoad,60,snd-usbmidi-lib snd-usb-audio) +else FILES:= \ $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \ $(LINUX_DIR)/sound/usb/snd-usb-audio.ko AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio) +endif endef define KernelPackage/usb-audio/description |