kernel: modules names changed with kernel 2.6.35

SVN-Revision: 22139

diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk
index e782e7b2398d1556437795aa993f1d3c3c4c1dc1..1c01a04fe8c141cceb986b6b3907d643e937078a 100644 (file)
--- 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 6af3ea8435c031ec1b2fe9bdd9c0d8befa281e65..4790ff977479075404cbd8d0b337c18f6dd6e01b 100644 (file)
--- 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