On Tue, Sep 7, 2010 at 07:49, Greg Ungerer <gerg@xxxxxxxxxxxx> wrote:
m68k/m68knommu: merge MMU and non-MMU atomic.h
The only difference between the MMU and non-MMU versions of atomic.h
is in the extra support ColdFire family processors. So merge this into
the MMU version of atomic.h.
Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxx>
---
arch/m68k/include/asm/{atomic_mm.h => atomic.h} | 16 ++-
arch/m68k/include/asm/atomic_no.h | 155 -----------------------
2 files changed, 13 insertions(+), 158 deletions(-)
rename arch/m68k/include/asm/{atomic_mm.h => atomic.h} (92%)
delete mode 100644 arch/m68k/include/asm/atomic_no.h
diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic.h
similarity index 92%
rename from arch/m68k/include/asm/atomic_mm.h
rename to arch/m68k/include/asm/atomic.h
index 6a223b3..3db3c93 100644
--- a/arch/m68k/include/asm/atomic_mm.h
+++ b/arch/m68k/include/asm/atomic.h
arch/m68k/include/asm/atomic.h had a line
| #include <asm-generic/atomic64.h>
before, which is now gone? This break lib/atomic64.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
