aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:39:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:39:30 +0000
commit88eb1b7ad0852f892e4276ca2c0a143aaedc8669 (patch)
treeeb93f5e069c807ac7e9199831aa377379e0a8cae
parent9aa7a94047d2e38cddb741d86c4f8ed569088575 (diff)
downloadupstream-88eb1b7ad0852f892e4276ca2c0a143aaedc8669.tar.gz
upstream-88eb1b7ad0852f892e4276ca2c0a143aaedc8669.tar.bz2
upstream-88eb1b7ad0852f892e4276ca2c0a143aaedc8669.zip
kernel: modules names changed with kernel 2.6.35
SVN-Revision: 22139
-rw-r--r--package/kernel/modules/pcmcia.mk7
-rw-r--r--package/kernel/modules/usb.mk7
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