summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-02-03 10:38:39 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2014-02-10 20:10:19 +0100
commit3067bab1cb6e45063c602a731b9341651c4f2ddb (patch)
treec3fa45e213aa8b8273e144d5c734785ea9667211 /arch/m68k
parenta18b31dd537f51331b9cd357987a5e807bf3e8d1 (diff)
downloadlinux-stable-3067bab1cb6e45063c602a731b9341651c4f2ddb.tar.gz
linux-stable-3067bab1cb6e45063c602a731b9341651c4f2ddb.tar.bz2
linux-stable-3067bab1cb6e45063c602a731b9341651c4f2ddb.zip
m68k: Switch to asm-generic/barrier.h
The generic nop() implementation is fine for m68k. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/m68k/include/asm/barrier.h8
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index df4d46fc321b..6fb9e813a910 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,3 +1,4 @@
+generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cputime.h
diff --git a/arch/m68k/include/asm/barrier.h b/arch/m68k/include/asm/barrier.h
deleted file mode 100644
index 15c5f77c1614..000000000000
--- a/arch/m68k/include/asm/barrier.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _M68K_BARRIER_H
-#define _M68K_BARRIER_H
-
-#define nop() do { asm volatile ("nop"); barrier(); } while (0)
-
-#include <asm-generic/barrier.h>
-
-#endif /* _M68K_BARRIER_H */