From patchwork Mon Nov 22 01:03:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: T Dent X-Patchwork-Id: 346561 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 oAM1QQGY005773 for ; Mon, 22 Nov 2010 01:26:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756355Ab0KVBER (ORCPT ); Sun, 21 Nov 2010 20:04:17 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:42017 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756239Ab0KVBEF (ORCPT ); Sun, 21 Nov 2010 20:04:05 -0500 Received: by mail-iw0-f174.google.com with SMTP id 34so2211862iwn.19 for ; Sun, 21 Nov 2010 17:04:05 -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=6nBszUiISzvPElAuikPtfbi2cqAzkB+ryd3JBIwQ6KY=; b=dGknBa5hCspjjlmOewQMYH1RgXQJG2QfBlFt1FaetHDb1jSeBANU08zezECIayzRjb Du287YJWP2tPdj7Q4ftWglK/HHCOHtV6ClkfSqnOSYEayg9vpGl9G2ZC7vXIRM6GsRo2 VhxWyoYRWGlEFl00xmpSLiMUv3jFgJ2g9BFxo= 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=jfH9X8DpmBIcwYvLCq9Ib3+q9yN2xzuHWoABCmWEIhJsfI5ZWDMKaCauZpl7GTgVZ4 G94Wgi4IU313IbML2YcBOmG7FLhwIoD25SAVUQ4BOaXhvsR8Z0KS/Md7r1UIFHpbEw6J 0xdb5uwJmJX5ZVyVmROZCwu8i8jg4sCOcSgqQ= Received: by 10.231.17.200 with SMTP id t8mr6061910iba.184.1290387844771; Sun, 21 Nov 2010 17:04:04 -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.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 21 Nov 2010 17:04:04 -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 07/17] Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions Date: Sun, 21 Nov 2010 20:03:18 -0500 Message-Id: <1290387808-2239-8-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:34 +0000 (UTC) diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile index 4811159..19eb59d 100644 --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile @@ -3,15 +3,15 @@ # # objects for l3 independent conntrack -nf_conntrack_ipv4-objs := nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o +nf_conntrack_ipv4-y := nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o ifeq ($(CONFIG_NF_CONNTRACK_PROC_COMPAT),y) ifeq ($(CONFIG_PROC_FS),y) nf_conntrack_ipv4-objs += nf_conntrack_l3proto_ipv4_compat.o endif endif -nf_nat-objs := nf_nat_core.o nf_nat_helper.o nf_nat_proto_unknown.o nf_nat_proto_common.o nf_nat_proto_tcp.o nf_nat_proto_udp.o nf_nat_proto_icmp.o -iptable_nat-objs := nf_nat_rule.o nf_nat_standalone.o +nf_nat-y := nf_nat_core.o nf_nat_helper.o nf_nat_proto_unknown.o nf_nat_proto_common.o nf_nat_proto_tcp.o nf_nat_proto_udp.o nf_nat_proto_icmp.o +iptable_nat-y := nf_nat_rule.o nf_nat_standalone.o # connection tracking obj-$(CONFIG_NF_CONNTRACK_IPV4) += nf_conntrack_ipv4.o