To: linus, akpm, jejb Cc: linux-scsi, lkml Subject: [PATCH] NCR53C9x SCSI: Fix Amiga Oktagon link error NCR53C9x SCSI: Fix Amiga Oktagon link error - Make esp_bootup_reset() global again, since the Amiga Oktagon SCSI driver needs it, and move its prototype from oktagon_esp.c to NCR53C9x.h - Make esp_cmd() static in the debug case. It's already a local macro in the non-debug case. Signed-off-by: Geert Uytterhoeven --- NCR53C9x.c | 4 ++-- NCR53C9x.h | 2 +- oktagon_esp.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) --- linux-2.6.11-rc1/drivers/scsi/NCR53C9x.c 2005-01-12 10:29:30.000000000 +0100 +++ linux-m68k-2.6.11-rc1/drivers/scsi/NCR53C9x.c 2005-01-17 20:29:36.000000000 +0100 @@ -290,7 +290,7 @@ #endif #ifdef DEBUG_ESP_CMDS -inline void esp_cmd(struct NCR_ESP *esp, struct ESP_regs *eregs, +static inline void esp_cmd(struct NCR_ESP *esp, struct ESP_regs *eregs, unchar cmd) { esp->espcmdlog[esp->espcmdent] = cmd; @@ -505,7 +505,7 @@ } /* This places the ESP into a known state at boot time. */ -static void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs) +void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs) { volatile unchar trash; --- linux-2.6.11-rc1/drivers/scsi/NCR53C9x.h 2005-01-12 10:29:30.000000000 +0100 +++ linux-m68k-2.6.11-rc1/drivers/scsi/NCR53C9x.h 2005-01-17 14:30:46.000000000 +0100 @@ -652,7 +652,7 @@ /* External functions */ -extern void esp_cmd(struct NCR_ESP *esp, struct ESP_regs *eregs, unchar cmd); +extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs); extern struct NCR_ESP *esp_allocate(Scsi_Host_Template *, void *); extern void esp_deallocate(struct NCR_ESP *); extern void esp_release(void); --- linux-2.6.11-rc1/drivers/scsi/oktagon_esp.c 2004-07-12 09:48:12.000000000 +0200 +++ linux-m68k-2.6.11-rc1/drivers/scsi/oktagon_esp.c 2005-01-17 14:28:33.000000000 +0100 @@ -72,8 +72,6 @@ static void dma_advance_sg(Scsi_Cmnd *); static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x); -void esp_bootup_reset(struct NCR_ESP *esp,struct ESP_regs *eregs); - #ifdef USE_BOTTOM_HALF static void dma_commit(void *opaque);