diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2012-03-28 12:10:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 16:47:12 -0400 |
| commit | 6523cf9a460c488c681b7e4ecef2395491de1d4e (patch) | |
| tree | 6783e2d14e9a767058837f343a3748e5ecffc111 /net | |
| parent | 81213b5e8ae68e204aa7a3f83c4f9100405dbff9 (diff) | |
| download | linux-3.10-6523cf9a460c488c681b7e4ecef2395491de1d4e.tar.gz linux-3.10-6523cf9a460c488c681b7e4ecef2395491de1d4e.tar.bz2 linux-3.10-6523cf9a460c488c681b7e4ecef2395491de1d4e.zip | |
net/netfilter/nfnetlink_acct.c: use linux/atomic.h
There's no known problem here, but this is one of only two non-arch files
in the kernel which use asm/atomic.h instead of linux/atomic.h.
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nfnetlink_acct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_acct.c b/net/netfilter/nfnetlink_acct.c index 3eb348bfc4f..d98c868c148 100644 --- a/net/netfilter/nfnetlink_acct.c +++ b/net/netfilter/nfnetlink_acct.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/skbuff.h> +#include <linux/atomic.h> #include <linux/netlink.h> #include <linux/rculist.h> #include <linux/slab.h> @@ -17,7 +18,6 @@ #include <linux/errno.h> #include <net/netlink.h> #include <net/sock.h> -#include <asm/atomic.h> #include <linux/netfilter.h> #include <linux/netfilter/nfnetlink.h> |