diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 05:40:37 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 05:40:37 -0500 |
| commit | 0bae2f17323a4630c487a9b77c37bebf407424af (patch) | |
| tree | fc1f71a0209ec61841a5acb65d59d147af3cc4fa /arch/sh/include | |
| parent | adf32eaa05323449b74b36f25b918583e2bdb6f1 (diff) | |
| parent | ca801a22f465eae39fadc770e15b5b7e82595f81 (diff) | |
Merge branch 'ib-mfd-regulator-gpio-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/barrier.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/barrier.h b/arch/sh/include/asm/barrier.h index f887c6465a82..8a84e05adb2e 100644 --- a/arch/sh/include/asm/barrier.h +++ b/arch/sh/include/asm/barrier.h | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | #define __smp_store_mb(var, value) do { (void)xchg(&var, value); } while (0) | 35 | #define __smp_store_mb(var, value) do { (void)xchg(&var, value); } while (0) |
| 36 | #define smp_store_mb(var, value) __smp_store_mb(var, value) | ||
| 37 | 36 | ||
| 38 | #include <asm-generic/barrier.h> | 37 | #include <asm-generic/barrier.h> |
| 39 | 38 | ||