[patch] 2.6.7-mm2: fdomain_cs needs unknown symbols

Adrian Bunk
2004-06-24T19:19:16Z

On Thu, Jun 24, 2004 at 01:46:55AM -0700, Andrew Morton wrote:
>...
> All 195 patches:
>...
> bk-scsi.patch
>...

This makes two functions in drivers/scsi/fdomain.c static that are
required in fdomain_cs.o:

<-- snip -->

WARNING: /lib/modules/2.6.7-mm2/kernel/drivers/scsi/pcmcia/fdomain_cs.ko
needs unknown symbol fdomain_16x0_bus_reset
WARNING: /lib/modules/2.6.7-mm2/kernel/drivers/scsi/pcmcia/fdomain_cs.ko
needs unknown symbol fdomain_setup

<-- snip -->

Although I agree that the way fdomain_cs.o is built is too ugly for
words, I'd suggest the following patch that revert these static's:

--- linux-2.6.7-mm2-modular/drivers/scsi/fdomain.c.old 2004-06-24 21:04:56.000000000 +0200
+++ linux-2.6.7-mm2-modular/drivers/scsi/fdomain.c 2004-06-24 21:07:17.000000000 +0200
@@ -418,7 +418,7 @@

static irqreturn_t do_fdomain_16x0_intr( int irq, void *dev_id,
struct pt_regs * regs );
-static int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt);
+int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt);

/* Allow insmod parameters to be like LILO parameters. For example:
insmod fdomain fdomain=0x140,11 */
@@ -555,7 +555,7 @@
printk( "\n" );
}

-static int __init fdomain_setup(char *str)
+int __init fdomain_setup(char *str)
{
int ints[4];

@@ -1541,7 +1541,7 @@
return SUCCESS;
}

-static int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt)
+int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt)
{
outb( 1, SCSI_Cntl_port );
do_pause( 2 );

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed