package/kernel: use macros for hid & input

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

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 9e2db60..49193e6 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -65,7 +65,7 @@ define KernelPackage/fs-mbcache
   KCONFIG:=CONFIG_FS_MBCACHE
   ifneq ($(CONFIG_FS_MBCACHE),)
     FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_FS_MBCACHE
   ifneq ($(CONFIG_FS_MBCACHE),)
     FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)

-    AUTOLOAD:=$(call AutoLoad,20,mbcache)
+    AUTOLOAD:=$(call AutoLoad,20,mbcache,1)

   endif
 endef
 
   endif
 endef
 


@@ -82,14 +82,14 @@ define KernelPackage/fs-ext2
   KCONFIG:=CONFIG_EXT2_FS
   DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_EXT2_FS
   DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,32,ext2)
+  AUTOLOAD:=$(call AutoLoad,32,ext2,1)

 endef
 
 define KernelPackage/fs-ext2/description
  Kernel module for EXT2 filesystem support
 endef
 
 endef
 
 define KernelPackage/fs-ext2/description
  Kernel module for EXT2 filesystem support
 endef
 

-$(eval $(call KernelPackage,fs-ext2))
+$(eval $(call KernelPackage,fs-ext2,1))

 
 
 define KernelPackage/fs-ext3
 
 
 define KernelPackage/fs-ext3


@@ -102,7 +102,7 @@ define KernelPackage/fs-ext3
   FILES:= \
        $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)
   FILES:= \
        $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,31,jbd ext3)
+  AUTOLOAD:=$(call AutoLoad,31,jbd ext3,1)

 endef
 
 define KernelPackage/fs-ext3/description
 endef
 
 define KernelPackage/fs-ext3/description


@@ -120,11 +120,12 @@ define KernelPackage/fs-ext4
        CONFIG_EXT4_FS_SECURITY=y \
        CONFIG_EXT4_FS \
        CONFIG_JBD2
        CONFIG_EXT4_FS_SECURITY=y \
        CONFIG_EXT4_FS \
        CONFIG_JBD2

-  DEPENDS:= @LINUX_2_6 +kmod-crc16 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:= @LINUX_2_6 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)

   FILES:= \
        $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
   FILES:= \
        $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4)
+  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
+  $(call AddDepends/crc16)

 endef
 
 define KernelPackage/fs-ext4/description
 endef
 
 define KernelPackage/fs-ext4/description


@@ -223,7 +224,7 @@ define KernelPackage/fs-nfs-common-v4
        CONFIG_SUNRPC_GSS\
        CONFIG_NFS_V4=y\
        CONFIG_NFSD_V4=y
        CONFIG_SUNRPC_GSS\
        CONFIG_NFS_V4=y\
        CONFIG_NFSD_V4=y

-  DEPENDS:= @LINUX_2_6 +kmod-fs-nfs-common
+  DEPENDS:= @LINUX_2_6 @BROKEN

   FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
   FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef


@@ -308,7 +309,7 @@ define KernelPackage/fs-reiserfs
   TITLE:=ReiserFS filesystem support
   KCONFIG:=CONFIG_REISERFS_FS
   FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX)
   TITLE:=ReiserFS filesystem support
   KCONFIG:=CONFIG_REISERFS_FS
   FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,reiserfs)
+  AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)

 endef
 
 define KernelPackage/fs-reiserfs/description
 endef
 
 define KernelPackage/fs-reiserfs/description


@@ -349,7 +350,7 @@ define KernelPackage/fs-xfs
   KCONFIG:=CONFIG_XFS_FS
   DEPENDS:= +kmod-fs-exportfs
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_XFS_FS
   DEPENDS:= +kmod-fs-exportfs
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,xfs)
+  AUTOLOAD:=$(call AutoLoad,30,xfs,1)

 endef
 
 define KernelPackage/fs-xfs/description
 endef
 
 define KernelPackage/fs-xfs/description


@@ -362,17 +363,15 @@ define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
   KCONFIG:=\
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
   KCONFIG:=\

-       CONFIG_CRYPTO_CRC32C \

        CONFIG_LIBCRC32C \
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n
   # for crc32c
        CONFIG_LIBCRC32C \
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n
   # for crc32c

-  DEPENDS:=+kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc

   FILES:=\
   FILES:=\

-       $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \

        $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)
        $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs)
+  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1)

 endef
 
 define KernelPackage/fs-btrfs/description
 endef
 
 define KernelPackage/fs-btrfs/description


@@ -401,7 +400,7 @@ define KernelPackage/nls-base
   TITLE:=Native Language Support
   KCONFIG:=CONFIG_NLS
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
   TITLE:=Native Language Support
   KCONFIG:=CONFIG_NLS
   FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,20,nls_base)
+  AUTOLOAD:=$(call AutoLoad,20,nls_base,1)

 endef
 
 define KernelPackage/nls-base/description
 endef
 
 define KernelPackage/nls-base/description