From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 28 Dec 2009 14:55:38 +0000 (+0000)
Subject: fix wrong paths after r18955.
X-Git-Tag: reboot~21552
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b6f5eeb1eed804c4b9a0876b024293dd68317f42;p=oweals%2Fopenwrt.git

fix wrong paths after r18955.

SVN-Revision: 18957
---

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index ee88eee343..0394881152 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -14,6 +14,12 @@ CRYPTO_MENU:=Cryptographic API modules
 #  - sha1 > sha1_generic (2.6.24)
 #  - sha256 > sha256_generic (2.6.24)
 #  - sha512 > sha512_generic (2.6.26)
+CRYPTO_GENERIC:=_generic
+AES_SUFFIX:=$(CRYPTO_GENERIC)
+DES_SUFFIX:=$(CRYPTO_GENERIC)
+SHA1_SUFFIX:=$(CRYPTO_GENERIC)
+SHA256_SUFFIX:=$(CRYPTO_GENERIC)
+SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
   CRYPTO_PREFIX:=crypto_
   BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX)
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 1ff47a0e89..10557a77a5 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -271,12 +271,16 @@ endef
 
 $(eval $(call KernelPackage,fs-nfsd))
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
+  MSDOS_DIR:=fat
+endif
+MSDOS_DIR?=msdos
 
 define KernelPackage/fs-msdos
   SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
   KCONFIG:=CONFIG_MSDOS_FS
-  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/$(MSDOS_DIR)/msdos.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,msdos)
 $(call KernelPackage/nls/Depends)
 endef
@@ -303,6 +307,11 @@ endef
 
 $(eval $(call KernelPackage,fs-reiserfs))
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)
+  VFAT_DIR:=fat
+endif
+VFAT_DIR?=vfat
+
 define KernelPackage/fs-vfat
   SUBMENU:=$(FS_MENU)
   TITLE:=VFAT filesystem support
@@ -311,7 +320,7 @@ define KernelPackage/fs-vfat
 	CONFIG_VFAT_FS
   FILES:= \
 	$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/$(VFAT_DIR)/vfat.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
 $(call KernelPackage/nls/Depends)
 endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index cc45667fa5..c5d065cc6d 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -371,7 +371,7 @@ $(eval $(call KernelPackage,mmc-at91))
 ifeq ($(KERNEL),2.4)
   WATCHDOG_DIR=char
 endif
-WATCHDOG_DIR?=char/watchdog
+WATCHDOG_DIR?=watchdog
 
 define KernelPackage/atmel-wdt
   SUBMENU:=$(OTHER_MENU)