diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
| commit | a60c6812feb6ba35b5b8a9ee8a5ca3d01d1fcd5f (patch) | |
| tree | 2290ff15f280314a063f3dfc523742c8934c4259 /drivers/scsi/esp.c | |
| parent | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (diff) | |
Merge with Linux 2.4.0-test8-pre1.
Diffstat (limited to 'drivers/scsi/esp.c')
| -rw-r--r-- | drivers/scsi/esp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index 1dcc8acb8..6339d1e90 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c @@ -1,4 +1,4 @@ -/* $Id: esp.c,v 1.94 2000/03/30 02:09:10 davem Exp $ +/* $Id: esp.c,v 1.95 2000/08/23 22:32:37 davem Exp $ * esp.c: EnhancedScsiProcessor Sun SCSI driver code. * * Copyright (C) 1995, 1998 David S. Miller (davem@caip.rutgers.edu) @@ -32,13 +32,16 @@ #include <asm/sbus.h> #include <asm/dma.h> #include <asm/system.h> -#include <asm/machines.h> #include <asm/ptrace.h> #include <asm/pgtable.h> #include <asm/oplib.h> #include <asm/io.h> #include <asm/irq.h> + +#ifndef __sparc_v9__ +#include <asm/machines.h> #include <asm/idprom.h> +#endif #include <linux/module.h> @@ -1634,6 +1637,7 @@ do_sync_known: */ int cdrom_hwbug_wkaround = 0; +#ifndef __sparc_v9__ /* Never allow disconnects or synchronous transfers on * SparcStation1 and SparcStation1+. Allowing those * to be enabled seems to lockup the machine completely. @@ -1654,6 +1658,7 @@ do_sync_known: esp->snip = 0; goto do_sync_known; } +#endif /* !(__sparc_v9__) */ /* We've talked to this guy before, * but never negotiated. Let's try, |