merge the control file and the .ipk file targets into one to prevent them from going...

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

diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 7663085..de7484a 100644 (file)
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -641,7 +641,7 @@ config BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE
 
 config BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG
        bool "Enable PID/Program name output"
 
 config BUSYBOX_CONFIG_FEATURE_NETSTAT_PRG
        bool "Enable PID/Program name output"

-       default n
+       default y

        depends on BUSYBOX_CONFIG_NETSTAT
        help
          Add support for -p flag to print out PID and program name.
        depends on BUSYBOX_CONFIG_NETSTAT
        help
          Add support for -p flag to print out PID and program name.


@@ -687,18 +687,6 @@ config BUSYBOX_CONFIG_ROUTE
        help
          Route displays or manipulates the kernel's IP routing tables.
 
        help
          Route displays or manipulates the kernel's IP routing tables.
 

-config BUSYBOX_CONFIG_SENDMAIL
-       bool "sendmail"
-       default n
-       help
-         Barebones sendmail.
-
-config BUSYBOX_CONFIG_FETCHMAIL
-       bool "fetchmail"
-       default n
-       help
-         Barebones fetchmail.
-

 config BUSYBOX_CONFIG_SLATTACH
        bool "slattach"
        default n
 config BUSYBOX_CONFIG_SLATTACH
        bool "slattach"
        default n


@@ -706,6 +694,16 @@ config BUSYBOX_CONFIG_SLATTACH
          slattach is a small utility to attach network interfaces to serial
          lines.
 
          slattach is a small utility to attach network interfaces to serial
          lines.
 

+#config TC
+#      bool "tc"
+#      default n
+#      help
+#        show / manipulate traffic control settings
+#
+#config FEATURE_TC_INGRESS
+#      def_bool n
+#      depends on TC
+

 config BUSYBOX_CONFIG_TELNET
        bool "telnet"
        default y
 config BUSYBOX_CONFIG_TELNET
        bool "telnet"
        default y


@@ -826,7 +824,7 @@ config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
          Allow tftp to specify block size, and tftpd to understand
          "blksize" option.
 
          Allow tftp to specify block size, and tftpd to understand
          "blksize" option.
 

-config BUSYBOX_CONFIG_DEBUG_TFTP
+config BUSYBOX_CONFIG_TFTP_DEBUG

        bool "Enable debug"
        default n
        depends on BUSYBOX_CONFIG_TFTP
        bool "Enable debug"
        default n
        depends on BUSYBOX_CONFIG_TFTP