diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-13 19:38:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-13 19:38:38 +0100 |
| commit | 3d5476d44fccb4494012990c0f01b3d7d0b3ae96 (patch) | |
| tree | 67c00f07d622c7e21901a6c0383c49c827182041 /mk | |
| parent | 208ac48fbc74fdc67bac5e39531710be516ce50e (diff) | |
| parent | 1ca706f0559b7a13f4f541aeaae71f824d837416 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-vars.mk | 1 | ||||
| -rw-r--r-- | mk/modules.mk | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 2f238c2c6..48b7023b5 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -5,4 +5,3 @@ KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1 ifneq ($(ADK_NATIVE),y) KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" HOSTCC="${HOSTCC}" endif - diff --git a/mk/modules.mk b/mk/modules.mk index 3e0ecacfc..b0bdddc6d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -22,6 +22,7 @@ $(eval $(call KMOD_template,KVM_INTEL,kvm-intel,\ # $(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\ + $(MODULES_DIR)/kernel/drivers/ata/libahci \ $(MODULES_DIR)/kernel/drivers/ata/ahci \ ,10)) @@ -439,6 +440,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_TFTP,nf-conntrack-tftp,\ $(eval $(call KMOD_template,NF_CONNTRACK_PPTP,nf-conntrack-pptp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_proto_gre \ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_pptp \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_proto_gre \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_pptp \ ,55)) @@ -722,11 +724,13 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\ ,35)) $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ + $(MODULES_DIR)/kernel/lib/raid6/raid6_pq \ $(MODULES_DIR)/kernel/crypto/xor \ $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \ $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \ $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \ $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \ + $(MODULES_DIR)/kernel/crypto/async_tx/async_pq \ $(MODULES_DIR)/kernel/drivers/md/raid456 \ ,35)) @@ -1134,7 +1138,7 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ ,40)) $(eval $(call KMOD_template,YENTA,yenta,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_rsrc \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) @@ -1587,6 +1591,7 @@ $(eval $(call KMOD_template,PLIP,plip,\ # # Profiling # + $(eval $(call KMOD_template,OPROFILE,oprofile,\ $(MODULES_DIR)/kernel/arch/$(ARCH)/oprofile/oprofile \ ,10)) |