diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:00 -0500 |
commit | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (patch) | |
tree | 592b8ecd6a2a4b618c5de1a2573f79cd932df31e /arch/m68k/kernel | |
parent | 198a4101197797fd9cee40c17dc285dc84c5d745 (diff) |
[PATCH] m68k: namespace pollution fix (custom->amiga_custom)
in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/asm-offsets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c index c787c5ba9513..246a8820c223 100644 --- a/arch/m68k/kernel/asm-offsets.c +++ b/arch/m68k/kernel/asm-offsets.c | |||
@@ -92,7 +92,7 @@ int main(void) | |||
92 | DEFINE(TRAP_TRACE, TRAP_TRACE); | 92 | DEFINE(TRAP_TRACE, TRAP_TRACE); |
93 | 93 | ||
94 | /* offsets into the custom struct */ | 94 | /* offsets into the custom struct */ |
95 | DEFINE(CUSTOMBASE, &custom); | 95 | DEFINE(CUSTOMBASE, &amiga_custom); |
96 | DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar)); | 96 | DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar)); |
97 | DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr)); | 97 | DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr)); |
98 | DEFINE(C_INTENA, offsetof(struct CUSTOM, intena)); | 98 | DEFINE(C_INTENA, offsetof(struct CUSTOM, intena)); |