hostapd: fix AP+STA reconnects

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

diff --git a/package/kernel/modules/nls.mk b/package/kernel/modules/nls.mk
index 74eeaf8..5b9565d 100644 (file)
--- a/package/kernel/modules/nls.mk
+++ b/package/kernel/modules/nls.mk
@@ -6,15 +6,14 @@
 #
 
 define AddDepends/nls
-  SUBMENU:=Native Language Support
-  DEPENDS:= +!LINUX_2_4:kmod-nls-base
+  DEPENDS+= +kmod-nls-base
 endef
 
 define KernelPackage/nls-base
   SUBMENU:=Native Language Support
   TITLE:=Native Language Support
   KCONFIG:=CONFIG_NLS
-  FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_base.ko
   AUTOLOAD:=$(call AutoLoad,20,nls_base,1)
 endef
 
@@ -26,12 +25,12 @@ $(eval $(call KernelPackage,nls-base))
 
 
 define KernelPackage/nls-cp437
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 437 (United States, Canada)
   KCONFIG:=CONFIG_NLS_CODEPAGE_437
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp437/description
@@ -42,12 +41,12 @@ $(eval $(call KernelPackage,nls-cp437))
 
 
 define KernelPackage/nls-cp775
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 775 (Baltic Rim)
   KCONFIG:=CONFIG_NLS_CODEPAGE_775
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp775)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp775/description
@@ -58,12 +57,12 @@ $(eval $(call KernelPackage,nls-cp775))
 
 
 define KernelPackage/nls-cp850
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 850 (Europe)
   KCONFIG:=CONFIG_NLS_CODEPAGE_850
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp850/description
@@ -74,12 +73,12 @@ $(eval $(call KernelPackage,nls-cp850))
 
 
 define KernelPackage/nls-cp852
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 852 (Europe)
   KCONFIG:=CONFIG_NLS_CODEPAGE_852
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp852)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp852/description
@@ -90,12 +89,12 @@ $(eval $(call KernelPackage,nls-cp852))
 
 
 define KernelPackage/nls-cp866
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 866 (Cyrillic)
   KCONFIG:=CONFIG_NLS_CODEPAGE_866
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp866)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp866/description
@@ -106,12 +105,12 @@ $(eval $(call KernelPackage,nls-cp866))
 
 
 define KernelPackage/nls-cp1250
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 1250 (Eastern Europe)
   KCONFIG:=CONFIG_NLS_CODEPAGE_1250
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp1250)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp1250/description
@@ -122,12 +121,12 @@ $(eval $(call KernelPackage,nls-cp1250))
 
 
 define KernelPackage/nls-cp1251
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=Codepage 1251 (Russian)
   KCONFIG:=CONFIG_NLS_CODEPAGE_1251
-  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_cp1251)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-cp1251/description
@@ -138,12 +137,12 @@ $(eval $(call KernelPackage,nls-cp1251))
 
 
 define KernelPackage/nls-iso8859-1
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
   KCONFIG:=CONFIG_NLS_ISO8859_1
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-iso8859-1/description
@@ -154,12 +153,12 @@ $(eval $(call KernelPackage,nls-iso8859-1))
 
 
 define KernelPackage/nls-iso8859-2
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
   KCONFIG:=CONFIG_NLS_ISO8859_2
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-iso8859-2/description
@@ -170,12 +169,12 @@ $(eval $(call KernelPackage,nls-iso8859-2))
 
 
 define KernelPackage/nls-iso8859-13
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=ISO 8859-13 (Latin 7; Baltic)
   KCONFIG:=CONFIG_NLS_ISO8859_13
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-iso8859-13/description
@@ -186,12 +185,12 @@ $(eval $(call KernelPackage,nls-iso8859-13))
 
 
 define KernelPackage/nls-iso8859-15
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
   KCONFIG:=CONFIG_NLS_ISO8859_15
-  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-iso8859-15/description
@@ -202,12 +201,12 @@ $(eval $(call KernelPackage,nls-iso8859-15))
 
 
 define KernelPackage/nls-koi8r
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=KOI8-R (Russian)
   KCONFIG:=CONFIG_NLS_KOI8_R
-  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-koi8r/description
@@ -218,12 +217,12 @@ $(eval $(call KernelPackage,nls-koi8r))
 
 
 define KernelPackage/nls-utf8
-  SUBMENU:=$(FS_MENU)
+  SUBMENU:=Native Language Support
   TITLE:=UTF-8
   KCONFIG:=CONFIG_NLS_UTF8
-  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.ko
   AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
-$(call AddDepends/nls)
+  $(call AddDepends/nls)
 endef
 
 define KernelPackage/nls-utf8/description