diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/scsi/mac_esp.c | |
parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) |
Merge with 2.3.27.
Diffstat (limited to 'drivers/scsi/mac_esp.c')
-rw-r--r-- | drivers/scsi/mac_esp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 726bf4107..036ffdf2c 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -22,25 +22,28 @@ #include <linux/blk.h> #include <linux/proc_fs.h> #include <linux/stat.h> +#include <linux/init.h> #include "scsi.h" #include "hosts.h" #include "NCR53C9x.h" #include "mac_esp.h" -#include "../../arch/m68k/mac/via6522.h" /* huh? */ - #include <asm/io.h> #include <asm/setup.h> #include <asm/irq.h> #include <asm/macints.h> #include <asm/machw.h> +#include <asm/mac_via.h> #include <asm/pgtable.h> #include <asm/macintosh.h> +#define mac_turnon_irq(x) mac_enable_irq(x) +#define mac_turnoff_irq(x) mac_disable_irq(x) + extern inline void esp_handle(struct NCR_ESP *esp); extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs); @@ -236,6 +239,8 @@ void mac_esp_setup(char *str, int *ints) { #endif } +__setup("mac53c9x=", mac_esp_setup); + /* * ESP address 'detection' */ |