diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 10:06:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:09:00 +0100 |
| commit | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (patch) | |
| tree | 592b8ecd6a2a4b618c5de1a2573f79cd932df31e /drivers/block/amiflop.c | |
| parent | [PATCH] m68k: compile fix - updated vmlinux.lds to include LOCK_TEXT (diff) | |
| download | linux-b4290a23cfa9040e2f0de5ab57d6ea65abaf053b.tar.xz linux-b4290a23cfa9040e2f0de5ab57d6ea65abaf053b.zip | |
[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/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 3c679d30b698..4c3b7df46f91 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -194,6 +194,8 @@ static DECLARE_WAIT_QUEUE_HEAD(ms_wait); */ #define MAX_ERRORS 12 +#define custom amiga_custom + /* Prevent "aliased" accesses. */ static int fd_ref[4] = { 0,0,0,0 }; static int fd_device[4] = { 0, 0, 0, 0 }; |