ath9k: merge a few more pending fixes, including a fix for the bogus WARN_ON in pci...

[openwrt.git] / package / busybox / Config.in

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 1002a5a..407e95e 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,20 +1,5 @@
-menu "Configuration"
-       depends on PACKAGE_busybox
 
-config BUSYBOX_CONFIG_FEATURE_DEVFS
-       bool
-       default y if LINUX_2_4
-       default n if LINUX_2_6
-
-config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
-       bool
-       default y if LINUX_2_4
-       default n if LINUX_2_6
-
-config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
-       bool
-       default n if LINUX_2_4
-       default y if LINUX_2_6
+if PACKAGE_busybox
 
 config BUSYBOX_CONFIG_NOMMU
        bool
@@ -34,6 +19,11 @@ config BUSYBOX_CONFIG_HUSH
        default y if NOMMU
        default n if !NOMMU
 
+config BUSYBOX_USE_LIBRPC
+       bool
+       depends USE_UCLIBC
+       default y if BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+
 source "package/busybox/config/Config.in"
 
-endmenu
+endif