From 89700f39926d918d40209f2c714fed55e75eeebb Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 28 Mar 2012 12:10:57 +0000
Subject: [PATCH] --- yaml --- r: 298481 b: refs/heads/master c:
 6523cf9a460c488c681b7e4ecef2395491de1d4e h: refs/heads/master i:   298479:
 33a4a3f4d4f17693c47b05ec8924084feb83cc6b v: v3

---
 [refs]                               | 2 +-
 trunk/net/netfilter/nfnetlink_acct.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6764706f5a04..ffdadb4e83a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81213b5e8ae68e204aa7a3f83c4f9100405dbff9
+refs/heads/master: 6523cf9a460c488c681b7e4ecef2395491de1d4e
diff --git a/trunk/net/netfilter/nfnetlink_acct.c b/trunk/net/netfilter/nfnetlink_acct.c
index 3eb348bfc4fb..d98c868c148b 100644
--- a/trunk/net/netfilter/nfnetlink_acct.c
+++ b/trunk/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>