mac80211: fix tx queue allocation for active monitor interfaces

[openwrt/staging/wigyori.git] / package / base-files / image-config.in

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index 88ec50a8e8647cff4022f8ff493b620e9e0151d4..cf2cfd1d4e49a57dacc6ac92f81283613ae55dd5 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -163,13 +163,6 @@ if VERSIONOPT
                        This is the name of the release distribution.
                        If unspecified, it defaults to OpenWrt.
 
-       config VERSION_NICK
-               string
-               prompt "Release version nickname"
-               help
-                       This is the release codename embedded in the image.
-                       If unspecified, it defaults to the name of source branch.
-
        config VERSION_NUMBER
                string
                prompt "Release version number"
@@ -199,8 +192,6 @@ if VERSIONOPT
                         %v .. Configured release version number or "snapshot", lowercase
                         %C .. Configured release revision code or value of %R, uppercase
                         %c .. Configured release revision code or value of %R, lowercase
-                        %N .. Release name, uppercase
-                        %n .. Release name, lowercase
                         %D .. Distribution name or "OpenWrt", uppercase
                         %d .. Distribution name or "openwrt", lowercase
                         %T .. Target name
@@ -211,6 +202,12 @@ if VERSIONOPT
                         %P .. Product name or "Generic"
                         %h .. Hardware revision or "v0"
 
+       config VERSION_HOME_URL
+               string
+               prompt "Release Homepage"
+               help
+                       This is the release version homepage
+
        config VERSION_MANUFACTURER
                string
                prompt "Manufacturer name"
@@ -277,18 +274,4 @@ menuconfig PER_FEED_REPO
                If set, a separate repository is generated within bin/*/packages/
                for the core packages and each enabled feed.
 
-       config PER_FEED_REPO_ADD_DISABLED
-               bool "Add available but not enabled feeds to opkg.conf"
-               default y
-               depends on PER_FEED_REPO
-               help
-                 Add not installed or disabled feeds from feeds.conf to opkg.conf.
-
-       config PER_FEED_REPO_ADD_COMMENTED
-               bool "Comment out not enabled feeds"
-               default !BUILDBOT
-               depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED
-               help
-                 Add not enabled feeds as commented out source lines to opkg.conf.
-
 source "tmp/.config-feeds.in"