diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 01:06:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 09:09:00 -0800 |
| commit | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (patch) | |
| tree | 592b8ecd6a2a4b618c5de1a2573f79cd932df31e /drivers/video | |
| 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 'drivers/video')
| -rw-r--r-- | drivers/video/amifb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index d549e215f3c5..8cfba10f843e 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -590,6 +590,8 @@ static u_short maxfmode, chipset; #define highw(x) ((u_long)(x)>>16 & 0xffff) #define loww(x) ((u_long)(x) & 0xffff) +#define custom amiga_custom + #define VBlankOn() custom.intena = IF_SETCLR|IF_COPER #define VBlankOff() custom.intena = IF_COPER |