[x86]

[openwrt.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 10557a7..fc1bd17 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -271,20 +271,18 @@ endef
 
 $(eval $(call KernelPackage,fs-nfsd))
 
 
 $(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
 define KernelPackage/fs-msdos
   SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
   KCONFIG:=CONFIG_MSDOS_FS

-  FILES:=$(LINUX_DIR)/fs/$(MSDOS_DIR)/msdos.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,40,msdos)
 $(call KernelPackage/nls/Depends)
 endef
 
   AUTOLOAD:=$(call AutoLoad,40,msdos)
 $(call KernelPackage/nls/Depends)
 endef
 

+define KernelPackage/fs-msdos/2.4
+  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
+endef

 
 define KernelPackage/fs-msdos/description
  Kernel module for MSDOS filesystem support
 
 define KernelPackage/fs-msdos/description
  Kernel module for MSDOS filesystem support


@@ -307,11 +305,6 @@ endef
 
 $(eval $(call KernelPackage,fs-reiserfs))
 
 
 $(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
 define KernelPackage/fs-vfat
   SUBMENU:=$(FS_MENU)
   TITLE:=VFAT filesystem support


@@ -320,11 +313,16 @@ define KernelPackage/fs-vfat
        CONFIG_VFAT_FS
   FILES:= \
        $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
        CONFIG_VFAT_FS
   FILES:= \
        $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \

-       $(LINUX_DIR)/fs/$(VFAT_DIR)/vfat.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/fs/fat/vfat.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
 $(call KernelPackage/nls/Depends)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
 $(call KernelPackage/nls/Depends)
 endef
 

+define KernelPackage/fs-vfat/2.4
+  FILES:= \
+       $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
+endef

 
 define KernelPackage/fs-vfat/description
  Kernel module for VFAT filesystem support
 
 define KernelPackage/fs-vfat/description
  Kernel module for VFAT filesystem support


@@ -357,7 +355,7 @@ define KernelPackage/fs-btrfs
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n
   # for crc32c
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n
   # for crc32c

-  DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25
+  DEPENDS:=+kmod-crypto-core

   FILES:=\
        $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
   FILES:=\
        $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \