X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b1d946d11b96a7cd6622db37a04b2df1f87fa108..6a05c1cf00e2a880936c2a913830c4d9281fcf0b:/package/kernel/modules/fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index c2ae55194..f7720e0e1 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -25,15 +25,13 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
-  DEPENDS:=+kmod-libcrc32c
+  DEPENDS:=+kmod-libcrc32c +kmod-zlib
   KCONFIG:=\
 	CONFIG_BTRFS_FS \
-	CONFIG_BTRFS_FS_POSIX_ACL=n \
-	CONFIG_ZLIB_DEFLATE
+	CONFIG_BTRFS_FS_POSIX_ACL=n
   FILES:=\
-	$(LINUX_DIR)/fs/btrfs/btrfs.ko \
-	$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
-  AUTOLOAD:=$(call AutoLoad,30,zlib_deflate btrfs,1)
+	$(LINUX_DIR)/fs/btrfs/btrfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
 endef
 
 define KernelPackage/fs-btrfs/description
@@ -78,7 +76,7 @@ define KernelPackage/fs-ext2
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
   AUTOLOAD:=$(call AutoLoad,32,ext2,1)
 endef
@@ -96,7 +94,7 @@ define KernelPackage/fs-ext3
   KCONFIG:= \
 	CONFIG_EXT3_FS \
 	CONFIG_JBD
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
   FILES:= \
 	$(LINUX_DIR)/fs/ext3/ext3.ko \
 	$(LINUX_DIR)/fs/jbd/jbd.ko
@@ -222,10 +220,6 @@ define KernelPackage/fs-msdos
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-msdos/2.4
-  FILES:=$(LINUX_DIR)/fs/msdos/msdos.ko
-endef
-
 define KernelPackage/fs-msdos/description
  Kernel module for MSDOS filesystem support
 endef
@@ -361,12 +355,6 @@ define KernelPackage/fs-vfat
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-vfat/2.4
-  FILES:= \
-	$(LINUX_DIR)/fs/fat/fat.ko \
-	$(LINUX_DIR)/fs/vfat/vfat.ko
-endef
-
 define KernelPackage/fs-vfat/description
  Kernel module for VFAT filesystem support
 endef