diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 2f53de11a..8f633860b 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,5 +1,5 @@ -ifeq ($(ADK_KERNEL_VERSION_3_17_5),y) -KERNEL_VERSION:= 3.17.5 +ifeq ($(ADK_KERNEL_VERSION_3_17_7),y) +KERNEL_VERSION:= 3.17.7 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 1aceebd5cce9427307b6a84c6b4a40d7 diff --git a/mk/modules.mk b/mk/modules.mk index a8b9089bc..180b4fd85 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -473,9 +473,12 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(MODULES_DIR)/kernel/net/netfilter/xt_conntrack \ ,41)) +$(eval $(call KMOD_template,NETFILTER_XT_NAT,netfilter-xt-nat,\ + $(MODULES_DIR)/kernel/net/netfilter/xt_nat \ +,40)) + $(eval $(call KMOD_template,NF_NAT,nf-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ - $(MODULES_DIR)/kernel/net/netfilter/xt_nat \ ,45)) $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ @@ -485,9 +488,12 @@ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) +$(eval $(call KMOD_template,IP_NF_NAT,ip-nf-nat,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ +,60)) + $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ $(MODULES_DIR)/kernel/net/netfilter/nf_nat_ftp \ @@ -1215,7 +1221,7 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ USBMODULES:= ifeq ($(KERNEL_BASE),3) -ifeq ($(KERNEL_MAJ),16) +ifeq ($(KERNEL_MAJ),17) USBMODULES+=drivers/usb/common/usb-common USBMODULES+=drivers/usb/core/usbcore else @@ -1237,7 +1243,7 @@ $(eval $(call KMOD_template,USB_MXS_PHY,usb-mxs-phy,\ ,56)) $(eval $(call KMOD_template,USB_GADGET,usb-gadget,\ - $(MODULES_DIR)/kernel/drivers/usb/gadget/udc-core \ + $(MODULES_DIR)/kernel/drivers/usb/gadget/udc/udc-core \ ,57)) $(eval $(call KMOD_template,USB_CHIPIDEA,ci-hdrc,\ |