port the changes from [3155] to Kamikaze

[openwrt.git] / openwrt / target / linux / Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index bb5afd3..46df407 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -22,7 +22,7 @@ endmenu
 
 menu "Kernel Configuration / Device Support"
 
-comment "Device specific modules"
+comment "Device specific configuration"
 
 source "target/linux/*-2.[46]/Config.in"
 
@@ -300,7 +300,7 @@ config BR2_PACKAGE_KMOD_CRYPTO
 
 comment "Filesystems support"
 
-config BR2_PACKAGE_KMOD_CIFS
+config BR2_PACKAGE_KMOD_FS_CIFS
        prompt "kmod-fs-cifs...................... CIFS support"
        tristate
        default m
@@ -515,8 +515,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_ARUBA
-       default y if BR2_LINUX_2_6_ARUBA
+       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
        default m
        help
          This driver is for the National Semiconductor DP83810 series,