• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: Commit

2.4.36-stable kernel tree


Commit MetaInfo

Revisionf9ae9de769da115a16ba0ce945dc581d4f24bd81 (tree)
Zeit2007-08-06 04:51:05
AutorWilly Tarreau <w@1wt....>
CommiterWilly Tarreau

Log Message

[PATCH] module fdomain_cs requires fdomain_setup()

The function which was called was once declared static
and once extern. Also, the arguments were messed up. That
one must not have worked for a long time.

Ändern Zusammenfassung

Diff

--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -561,7 +561,8 @@ static void print_banner( struct Scsi_Host *shpnt )
561561 printk( "\n" );
562562 }
563563
564-static int __init fdomain_setup( char *str )
564+/* no __init, may be called from fdomain_stubs.c */
565+int fdomain_setup( char *str )
565566 {
566567 int ints[4];
567568
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -85,7 +85,7 @@ typedef struct scsi_info_t {
8585 dev_node_t node[8];
8686 } scsi_info_t;
8787
88-extern void fdomain_setup(char *str, int *ints);
88+extern int fdomain_setup(char *str);
8989
9090 static void fdomain_release(u_long arg);
9191 static int fdomain_event(event_t event, int priority,
@@ -253,7 +253,7 @@ static void fdomain_config(dev_link_t *link)
253253 ints[1] = link->io.BasePort1;
254254 ints[2] = link->irq.AssignedIRQ;
255255 sprintf(str, "%d,%d", link->io.BasePort1, link->irq.AssignedIRQ);
256- fdomain_setup(str, ints);
256+ fdomain_setup(str);
257257
258258 scsi_register_module(MODULE_SCSI_HA, &driver_template);
259259
Show on old repository browser