diff options
author | Al Viro | 2006-01-12 10:06:12 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-01-12 18:09:00 +0100 |
commit | b4290a23cfa9040e2f0de5ab57d6ea65abaf053b (patch) | |
tree | 592b8ecd6a2a4b618c5de1a2573f79cd932df31e /drivers/scsi/oktagon_esp.c | |
parent | [PATCH] m68k: compile fix - updated vmlinux.lds to include LOCK_TEXT (diff) | |
download | kernel-qcow2-linux-b4290a23cfa9040e2f0de5ab57d6ea65abaf053b.tar.gz kernel-qcow2-linux-b4290a23cfa9040e2f0de5ab57d6ea65abaf053b.tar.xz kernel-qcow2-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/scsi/oktagon_esp.c')
-rw-r--r-- | drivers/scsi/oktagon_esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index 5d9c9ada814f..dee426f8c07b 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c @@ -490,7 +490,7 @@ static void dma_led_on(struct NCR_ESP *esp) static int dma_ports_p(struct NCR_ESP *esp) { - return ((custom.intenar) & IF_PORTS); + return ((amiga_custom.intenar) & IF_PORTS); } static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |