diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-10 13:55:07 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-10 13:55:07 +0100 |
| commit | 71ce42c6e2bd2803e53cc2f9faa1d352dd4c5cb4 (patch) | |
| tree | 2ad52a77a4bd39b096e04732ea52fa15a539d350 /mk | |
| parent | 1cff8718ea65707b3af7d9ee1bca0386b6de0c8e (diff) | |
| parent | a15599b22985f9b688ec6407881fa74b32e7f522 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-ver.mk | 3 | ||||
| -rw-r--r-- | mk/modules.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk new file mode 100644 index 000000000..50b8c4056 --- /dev/null +++ b/mk/kernel-ver.mk @@ -0,0 +1,3 @@ +KERNEL_VERSION:= 2.6.36 +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= 61f3739a73afb6914cb007f37fb09b62 diff --git a/mk/modules.mk b/mk/modules.mk index bbf97be37..bccfe57be 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -717,7 +717,6 @@ $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ $(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/drivers/md/raid6_pq \ $(MODULES_DIR)/kernel/crypto/async_tx/async_raid6_recov \ $(MODULES_DIR)/kernel/drivers/md/raid456 \ ,35)) @@ -855,7 +854,7 @@ $(eval $(call KMOD_template,CRYPTO_BLOWFISH,crypto-blowfish,\ $(eval $(call KMOD_template,CRYPTO_TWOFISH,crypto-twofish,\ $(MODULES_DIR)/kernel/crypto/twofish_common \ - $(MODULES_DIR)/kernel/crypto/twofish \ + $(MODULES_DIR)/kernel/crypto/twofish_generic \ ,11)) $(eval $(call KMOD_template,CRYPTO_TWOFISH_586,crypto-twofish-586,\ @@ -956,7 +955,7 @@ $(eval $(call KMOD_template,OCF_TALITOS,ocf-talitos,\ # Filesystems # -$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\ +#$(eval $(call KMOD_template,AUFS_FS,aufs-fs,\ $(MODULES_DIR)/kernel/fs/aufs/aufs \ ,30)) |