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/w1 | |
| 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/w1')
| -rw-r--r-- | drivers/w1/masters/matrox_w1.c | 2 | ||||
| -rw-r--r-- | drivers/w1/w1.c | 2 | ||||
| -rw-r--r-- | drivers/w1/w1_family.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index 1550431ccb6a..334d1ccf9c92 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c @@ -20,7 +20,7 @@ */ #include <asm/types.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 10606c822756..6c136c19e982 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -33,7 +33,7 @@ #include <linux/kthread.h> #include <linux/freezer.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include "w1.h" #include "w1_log.h" diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h index 89a0b1f2794b..98a1ac0f4693 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h @@ -24,7 +24,7 @@ #include <linux/types.h> #include <linux/device.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #define W1_FAMILY_DEFAULT 0 #define W1_FAMILY_SMEM_01 0x01 |