From 3067bab1cb6e45063c602a731b9341651c4f2ddb Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 3 Feb 2014 10:38:39 +0100
Subject: 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>
---
arch/m68k/include/asm/barrier.h | 8 --------
1 file changed, 8 deletions(-)
delete mode 100644 arch/m68k/include/asm/barrier.h
(limited to 'arch/m68k/include/asm/barrier.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 */
--
cgit v1.2.3-70-g09d2