brcm47xx: backport patch from kernel 2.6.37

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

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 9420f53..8353474 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -1,19 +1,24 @@
-config BR2_PACKAGE_BUSYBOX
-       bool "busybox"
-       default y
-       help
-         The Swiss Army Knife of embedded Linux.  It slices, it dices, it
-         makes Julian Fries.
+menu "Configuration"
+       depends on PACKAGE_busybox

 
 

-         http://busybox.net/
+config BUSYBOX_CONFIG_NOMMU
+       bool
+       depends NOMMU
+       default y if NOMMU
+       deselect BUSYBOX_CONFIG_ASH
+       deselect BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+       deselect BUSYBOX_CONFIG_LOCK

 
 

-         Most people will answer Y.
+config CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+       bool
+       default y if NOMMU
+       default n if !NOMMU

 
 

-config BR2_PACKAGE_BUSYBOX_SNAPSHOT
-       bool "Use the daily snapshot of busybox?"
-       depends BR2_PACKAGE_BUSYBOX
-       default n
-       help
-         Use the latest busybox CVS snapshot instead of release.
+config BUSYBOX_CONFIG_HUSH
+       bool
+       default y if NOMMU
+       default n if !NOMMU

 
 

-         For fun, you should say Y.
+source "package/busybox/config/Config.in"
+
+endmenu