m68k/m68knommu: merge MMU and non-MMU atomic.h
authorGreg Ungerer <gerg@snapgear.com>
Wed, 8 Sep 2010 00:31:11 +0000 (10:31 +1000)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 22 Oct 2010 07:43:24 +0000 (09:43 +0200)
commit69f99746a2cfd88b9caed8e320ad86405b228ada
tree96711f779d18d9f00a6a2b50cb60e1c301e28dac
parent138ff3462f53a7370bef15443e623ecba1c350bf
m68k/m68knommu: merge MMU and non-MMU atomic.h

The only difference between the MMU and non-MMU versions of atomic.h
is some extra support needed by ColdFire family processors. So merge
this into the MMU version of atomic.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/atomic.h
arch/m68k/include/asm/atomic_mm.h [deleted file]
arch/m68k/include/asm/atomic_no.h [deleted file]