diff options
| author | Arun Sharma <asharma@fb.com> | 2011-07-26 16:09:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 16:49:47 -0700 |
| commit | 60063497a95e716c9a689af3be2687d261f115b4 (patch) | |
| tree | 6ce0d68db76982c53df46aee5f29f944ebf2c320 /drivers/net/cxgb4 | |
| parent | 148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed (diff) | |
atomic: use <linux/atomic.h>
This allows us to move duplicated code in <asm/atomic.h>
(atomic_inc_not_zero() for now) to <linux/atomic.h>
Signed-off-by: Arun Sharma <asharma@fb.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/cxgb4')
| -rw-r--r-- | drivers/net/cxgb4/cxgb4_uld.h | 2 | ||||
| -rw-r--r-- | drivers/net/cxgb4/l2t.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb4/cxgb4_uld.h b/drivers/net/cxgb4/cxgb4_uld.h index 1b48c0170145..b1d39b8d141a 100644 --- a/drivers/net/cxgb4/cxgb4_uld.h +++ b/drivers/net/cxgb4/cxgb4_uld.h @@ -38,7 +38,7 @@ #include <linux/cache.h> #include <linux/spinlock.h> #include <linux/skbuff.h> -#include <asm/atomic.h> +#include <linux/atomic.h> /* CPL message priority levels */ enum { diff --git a/drivers/net/cxgb4/l2t.h b/drivers/net/cxgb4/l2t.h index 7bd8f42378ff..02b31d0c6410 100644 --- a/drivers/net/cxgb4/l2t.h +++ b/drivers/net/cxgb4/l2t.h @@ -37,7 +37,7 @@ #include <linux/spinlock.h> #include <linux/if_ether.h> -#include <asm/atomic.h> +#include <linux/atomic.h> struct adapter; struct l2t_data; |