summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-10-30 16:24:28 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2012-11-14 08:50:54 +0100
commit8affd3e8122537a295bb69571a68f816a5e6867c (patch)
treef6f96c779956446819aee66b9f99a3eba6282005
parent32782d51e95bb891695049033d0ba9ce0eefcd84 (diff)
downloadop-kernel-dev-8affd3e8122537a295bb69571a68f816a5e6867c.zip
op-kernel-dev-8affd3e8122537a295bb69571a68f816a5e6867c.tar.gz
m68k: switch to using the asm-generic spinlock.h
We don't need a local spinlock.h, switch to using the asm-generic version. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/m68k/include/asm/spinlock.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index bf28713..a494c3e 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -23,6 +23,7 @@ generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
generic-y += siginfo.h
+generic-y += spinlock.h
generic-y += statfs.h
generic-y += topology.h
generic-y += types.h
diff --git a/arch/m68k/include/asm/spinlock.h b/arch/m68k/include/asm/spinlock.h
deleted file mode 100644
index 20f46e2..0000000
--- a/arch/m68k/include/asm/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68K_SPINLOCK_H
-#define __M68K_SPINLOCK_H
-
-#error "m68k doesn't do SMP yet"
-
-#endif
OpenPOWER on IntegriCloud