From patchwork Wed Jul 11 06:09:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 170363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 0FF2A2C01D3 for ; Wed, 11 Jul 2012 16:20:44 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Soq7w-0004TY-Pe; Wed, 11 Jul 2012 06:10:20 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Soq7m-0004Qr-38 for kernel-team@lists.ubuntu.com; Wed, 11 Jul 2012 06:10:10 +0000 Received: from [101.224.51.72] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Soq7c-0001BV-9G; Wed, 11 Jul 2012 06:10:05 +0000 From: Bryan Wu To: tim.gardner@canonical.com, apw@canonical.com, paolo.pisati@canonical.com, kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: [Config] disable DEPRECATED config options Date: Wed, 11 Jul 2012 14:09:06 +0800 Message-Id: <1341986947-28300-3-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1341986947-28300-1-git-send-email-bryan.wu@canonical.com> References: <1341986947-28300-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com CONFIG_NF_CONNTRACK_PROCFS CONFIG_PRINT_QUOTA_WARNING CONFIG_WAN_ROUTER Signed-off-by: Bryan Wu --- debian.ti-omap4/config/config.common.ubuntu | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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