Patchwork [2/3] UBUNTU: [Config] disable DEPRECATED config options

login
register
mail settings
Submitter Bryan Wu
Date July 11, 2012, 6:09 a.m.
Message ID <1341986947-28300-3-git-send-email-bryan.wu@canonical.com>
Download mbox | patch
Permalink /patch/170363/
State New
Headers show

Comments

Bryan Wu - July 11, 2012, 6:09 a.m.
CONFIG_NF_CONNTRACK_PROCFS
CONFIG_PRINT_QUOTA_WARNING
CONFIG_WAN_ROUTER

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
 debian.ti-omap4/config/config.common.ubuntu | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
Tim Gardner - July 11, 2012, 5:14 p.m.
On 07/11/2012 12:09 AM, Bryan Wu wrote:
> CONFIG_NF_CONNTRACK_PROCFS
> CONFIG_PRINT_QUOTA_WARNING
> CONFIG_WAN_ROUTER
> 

I suspect CONFIG_WAN_ROUTER is likely to be much less of an issue on a
ti-omap4 platform.

rtg

Patch

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 96f94ad..82bbe78 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -2412,8 +2412,7 @@  CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
 CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_SIP=m
@@ -2692,7 +2691,7 @@  CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTER=m
 CONFIG_PRINTK=y
 CONFIG_PRINTK_TIME=y
-CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_PRISM2_USB=m
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PROC_EVENTS=y
@@ -4003,8 +4002,7 @@  CONFIG_W1_SLAVE_THERM=m
 CONFIG_W35UND=m
 # CONFIG_WAKELOCK is not set
 CONFIG_WAN=y
-CONFIG_WAN_ROUTER=m
-CONFIG_WAN_ROUTER_DRIVERS=m
+# CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y