aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorArun Sharma <asharma@fb.com>2011-07-26 19:09:06 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 19:49:47 -0400
commit60063497a95e716c9a689af3be2687d261f115b4 (patch)
tree6ce0d68db76982c53df46aee5f29f944ebf2c320 /drivers/atm
parent148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed (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/atm')
-rw-r--r--drivers/atm/ambassador.c2
-rw-r--r--drivers/atm/atmtcp.c2
-rw-r--r--drivers/atm/eni.c2
-rw-r--r--drivers/atm/eni.h2
-rw-r--r--drivers/atm/firestream.c2
-rw-r--r--drivers/atm/fore200e.c2
-rw-r--r--drivers/atm/horizon.c2
-rw-r--r--drivers/atm/idt77252.c2
-rw-r--r--drivers/atm/iphase.c2
-rw-r--r--drivers/atm/nicstar.c2
-rw-r--r--drivers/atm/suni.c2
-rw-r--r--drivers/atm/uPD98402.c2
-rw-r--r--drivers/atm/zatm.c2
13 files changed, 13 insertions, 13 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index bb3b016b6ce8..f8f41e0e8a8c 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -38,7 +38,7 @@
38#include <linux/ihex.h> 38#include <linux/ihex.h>
39#include <linux/slab.h> 39#include <linux/slab.h>
40 40
41#include <asm/atomic.h> 41#include <linux/atomic.h>
42#include <asm/io.h> 42#include <asm/io.h>
43#include <asm/byteorder.h> 43#include <asm/byteorder.h>
44 44
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 0b0625054a87..b22d71cac54c 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -11,7 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <asm/uaccess.h> 13#include <asm/uaccess.h>
14#include <asm/atomic.h> 14#include <linux/atomic.h>
15 15
16 16
17extern int atm_init_aal5(struct atm_vcc *vcc); /* "raw" AAL5 transport */ 17extern int atm_init_aal5(struct atm_vcc *vcc); /* "raw" AAL5 transport */
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 3230ea0df83c..93071417315f 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -21,7 +21,7 @@
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <asm/system.h> 22#include <asm/system.h>
23#include <asm/io.h> 23#include <asm/io.h>
24#include <asm/atomic.h> 24#include <linux/atomic.h>
25#include <asm/uaccess.h> 25#include <asm/uaccess.h>
26#include <asm/string.h> 26#include <asm/string.h>
27#include <asm/byteorder.h> 27#include <asm/byteorder.h>
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h
index 493a6932507e..dc9a62cc2605 100644
--- a/drivers/atm/eni.h
+++ b/drivers/atm/eni.h
@@ -14,7 +14,7 @@
14#include <linux/time.h> 14#include <linux/time.h>
15#include <linux/pci.h> 15#include <linux/pci.h>
16#include <linux/spinlock.h> 16#include <linux/spinlock.h>
17#include <asm/atomic.h> 17#include <linux/atomic.h>
18 18
19#include "midway.h" 19#include "midway.h"
20 20
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 7c7b571647f9..5072f8ac16fd 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -52,7 +52,7 @@
52#include <asm/system.h> 52#include <asm/system.h>
53#include <asm/string.h> 53#include <asm/string.h>
54#include <asm/io.h> 54#include <asm/io.h>
55#include <asm/atomic.h> 55#include <linux/atomic.h>
56#include <asm/uaccess.h> 56#include <asm/uaccess.h>
57#include <linux/wait.h> 57#include <linux/wait.h>
58 58
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index bc9e702186dd..361f5aee3be1 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -44,7 +44,7 @@
44#include <asm/dma.h> 44#include <asm/dma.h>
45#include <asm/byteorder.h> 45#include <asm/byteorder.h>
46#include <asm/uaccess.h> 46#include <asm/uaccess.h>
47#include <asm/atomic.h> 47#include <linux/atomic.h>
48 48
49#ifdef CONFIG_SBUS 49#ifdef CONFIG_SBUS
50#include <linux/of.h> 50#include <linux/of.h>
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 287506183893..b81210330aca 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -45,7 +45,7 @@
45 45
46#include <asm/system.h> 46#include <asm/system.h>
47#include <asm/io.h> 47#include <asm/io.h>
48#include <asm/atomic.h> 48#include <linux/atomic.h>
49#include <asm/uaccess.h> 49#include <asm/uaccess.h>
50#include <asm/string.h> 50#include <asm/string.h>
51#include <asm/byteorder.h> 51#include <asm/byteorder.h>
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index be0dbfeb541c..db06f34419cf 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -46,7 +46,7 @@
46 46
47#include <asm/io.h> 47#include <asm/io.h>
48#include <asm/uaccess.h> 48#include <asm/uaccess.h>
49#include <asm/atomic.h> 49#include <linux/atomic.h>
50#include <asm/byteorder.h> 50#include <asm/byteorder.h>
51 51
52#ifdef CONFIG_ATM_IDT77252_USE_SUNI 52#ifdef CONFIG_ATM_IDT77252_USE_SUNI
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 957106f636ea..cb90f7a3e074 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -58,7 +58,7 @@
58#include <linux/slab.h> 58#include <linux/slab.h>
59#include <asm/system.h> 59#include <asm/system.h>
60#include <asm/io.h> 60#include <asm/io.h>
61#include <asm/atomic.h> 61#include <linux/atomic.h>
62#include <asm/uaccess.h> 62#include <asm/uaccess.h>
63#include <asm/string.h> 63#include <asm/string.h>
64#include <asm/byteorder.h> 64#include <asm/byteorder.h>
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 6b313ee9231b..1c70c45fa044 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -51,7 +51,7 @@
51#include <linux/idr.h> 51#include <linux/idr.h>
52#include <asm/io.h> 52#include <asm/io.h>
53#include <asm/uaccess.h> 53#include <asm/uaccess.h>
54#include <asm/atomic.h> 54#include <linux/atomic.h>
55#include "nicstar.h" 55#include "nicstar.h"
56#ifdef CONFIG_ATM_NICSTAR_USE_SUNI 56#ifdef CONFIG_ATM_NICSTAR_USE_SUNI
57#include "suni.h" 57#include "suni.h"
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index 41c56eae4c81..90f1ccca9e52 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -25,7 +25,7 @@
25#include <asm/system.h> 25#include <asm/system.h>
26#include <asm/param.h> 26#include <asm/param.h>
27#include <asm/uaccess.h> 27#include <asm/uaccess.h>
28#include <asm/atomic.h> 28#include <linux/atomic.h>
29 29
30#include "suni.h" 30#include "suni.h"
31 31
diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
index c45ae0573bbd..5120a96b3a89 100644
--- a/drivers/atm/uPD98402.c
+++ b/drivers/atm/uPD98402.c
@@ -11,7 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <asm/uaccess.h> 13#include <asm/uaccess.h>
14#include <asm/atomic.h> 14#include <linux/atomic.h>
15 15
16#include "uPD98402.h" 16#include "uPD98402.h"
17 17
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 7f8c5132ff32..d889f56e8d8c 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -27,7 +27,7 @@
27#include <asm/system.h> 27#include <asm/system.h>
28#include <asm/string.h> 28#include <asm/string.h>
29#include <asm/io.h> 29#include <asm/io.h>
30#include <asm/atomic.h> 30#include <linux/atomic.h>
31#include <asm/uaccess.h> 31#include <asm/uaccess.h>
32 32
33#include "uPD98401.h" 33#include "uPD98401.h"