diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
| commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
| tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /mk/modules.mk | |
| parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
| parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'mk/modules.mk')
| -rw-r--r-- | mk/modules.mk | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index aac667376..eaa8bb632 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -361,12 +361,20 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-clas $(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \ ,50)) +ifeq ($(KERNEL_VERSION),2.6.35) +CONNMARK:=xt_connmark +MARK:=xt_mark +else +CONNMARK:=xt_CONNMARK +MARK:=xt_MARK +endif + $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,netfilter-xt-target-connmark,\ - $(MODULES_DIR)/kernel/net/netfilter/xt_CONNMARK \ + $(MODULES_DIR)/kernel/net/netfilter/$(CONNMARK) \ ,50)) $(eval $(call KMOD_template,NETFILTER_XT_TARGET_MARK,netfilter-xt-target-mark,\ - $(MODULES_DIR)/kernel/net/netfilter/xt_MARK \ + $(MODULES_DIR)/kernel/net/netfilter/$(MARK) \ ,50)) $(eval $(call KMOD_template,NETFILTER_XT_TARGET_NFQUEUE,netfilter-xt-target-nfqueue,\ @@ -1217,8 +1225,14 @@ $(eval $(call KMOD_template,USB_HSO,usb-hso,\ $(MODULES_DIR)/kernel/drivers/net/usb/hso \ ,75)) +ifeq ($(KERNEL_VERSION),2.6.35) +SNDUSB:=snd-usbmidi-lib +else +SNDUSB:=snd-usb-lib +endif + $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ - $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \ + $(MODULES_DIR)/kernel/sound/usb/$(SNDUSB) \ $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \ ,75)) |