Преглед изворни кода

kernel: modules names changed with kernel 2.6.35

SVN-Revision: 22139
Hauke Mehrtens пре 15 година
родитељ
комит
88eb1b7ad0
2 измењених фајлова са 14 додато и 0 уклоњено
  1. 7 0
      package/kernel/modules/pcmcia.mk
  2. 7 0
      package/kernel/modules/usb.mk

+ 7 - 0
package/kernel/modules/pcmcia.mk

@@ -54,10 +54,17 @@ define KernelPackage/pcmcia-yenta
   KCONFIG:= \
   KCONFIG:= \
 	CONFIG_PCCARD_NONSTATIC \
 	CONFIG_PCCARD_NONSTATIC \
 	CONFIG_YENTA
 	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:= \
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
 	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)
   AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)
+endif
 endef
 endef
 
 
 $(eval $(call KernelPackage,pcmcia-yenta))
 $(eval $(call KernelPackage,pcmcia-yenta))

+ 7 - 0
package/kernel/modules/usb.mk

@@ -125,10 +125,17 @@ define KernelPackage/usb-audio
 	CONFIG_SND_USB_AUDIO
 	CONFIG_SND_USB_AUDIO
   $(call AddDepends/usb)
   $(call AddDepends/usb)
   $(call AddDepends/sound)
   $(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:= \
   FILES:= \
 	$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
 	$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
   AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
+endif
 endef
 endef
 
 
 define KernelPackage/usb-audio/description
 define KernelPackage/usb-audio/description