From patchwork Mon Nov 22 01:03:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: T Dent X-Patchwork-Id: 346511 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAM1QQGZ005773 for ; Mon, 22 Nov 2010 01:26:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756387Ab0KVBEU (ORCPT ); Sun, 21 Nov 2010 20:04:20 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:35395 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756242Ab0KVBEI (ORCPT ); Sun, 21 Nov 2010 20:04:08 -0500 Received: by mail-iw0-f174.google.com with SMTP id 34so2211918iwn.19 for ; Sun, 21 Nov 2010 17:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=7UGQZsB4XWNbrFa0Ip+s6hRdj4BmaDElOu5d0DT9KI4=; b=JJ6lLGkkwpYdtXR5X6G5NLOkmW0sdVo/ieGLrhXac8lZTrgnL22hE0thd2n4+ZXv5v 3STSwtgy3W4VNTH4nSv07V4srOxErzIZ/VX9S4e72U/1YXbdbiOUlxJOmxXyiF25YTpg QBYHqm62KE+Mp4eL2A3azs3FMbLG/RAm6iRxM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=LXK/cw+cDNOxsSAd7VJFiRSokX5B7nuwv5GThYMPkcadrt3glw96SGxfe7pTw/ovI7 5r1E4F28DWHK5SqiWHBUpwbChJxIXAXbvZnFCK0uirIlBlOKF2p8IdWsQNDllIKO/iO+ 8OB5b0hfRNddbA2gnop9gK/e9DyHGDbtUPAb0= Received: by 10.231.35.73 with SMTP id o9mr6009872ibd.193.1290387847433; Sun, 21 Nov 2010 17:04:07 -0800 (PST) Received: from localhost.localdomain (c-68-40-227-221.hsd1.mi.comcast.net [68.40.227.221]) by mx.google.com with ESMTPS id z4sm529915ibg.19.2010.11.21.17.04.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Nov 2010 17:04:06 -0800 (PST) From: Tracey Dent To: davem@davemloft.net Cc: marcel@holtmann.org, padovan@profusion.mobi, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, sjur.brandeland@stericsson.com, socketcan@hartkopp.net, urs.thuermann@volkswagen.de, socketcan-core@lists.berlios.de, sage@newdream.net, ceph-devel@vger.kernel.org, wang840925@gmail.com, jlayton@redhat.com, kaber@trash.net, pekkas@netcore.fi, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, samuel@sortiz.org, Tracey Dent Subject: [PATCH 08/17] Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions Date: Sun, 21 Nov 2010 20:03:19 -0500 Message-Id: <1290387808-2239-9-git-send-email-tdent48227@gmail.com> X-Mailer: git-send-email 1.7.3.2.245.g03276 In-Reply-To: <1290387808-2239-1-git-send-email-tdent48227@gmail.com> References: <1290387808-2239-1-git-send-email-tdent48227@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 22 Nov 2010 01:26:35 +0000 (UTC) diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile index 0a432c9..abfee91 100644 --- a/net/ipv6/netfilter/Makefile +++ b/net/ipv6/netfilter/Makefile @@ -11,13 +11,13 @@ obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o # objects for l3 independent conntrack -nf_conntrack_ipv6-objs := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o +nf_conntrack_ipv6-y := nf_conntrack_l3proto_ipv6.o nf_conntrack_proto_icmpv6.o # l3 independent conntrack obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_defrag_ipv6.o # defrag -nf_defrag_ipv6-objs := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o +nf_defrag_ipv6-y := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o # matches