]> err.no Git - linux-2.6/commit
m68k: Prefix ISA type with ISA_TYPE_
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 18 May 2008 18:47:21 +0000 (20:47 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 May 2008 20:28:50 +0000 (13:28 -0700)
commit52de114e357b8035d54040be8b9148de437b5b4b
tree8eeca3387e15a2c4e54ac4a4a4b404744b2dbd06
parent91cf248396d18989f5f4090497723f4f90c8971f
m68k: Prefix ISA type with ISA_TYPE_

The *_ISA type defines are quite generic and cause namespace conflicts
(e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in <asm/amigahw.h>) for some kernel
configurations. Use ISA_TYPE_* to avoid such conflicts.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/m68k/kernel/setup.c
include/asm-m68k/io.h