[PATCH] fix aha1542.c setup_str[] not protected by #ifndef MODULE

William Lee Irwin III (wli@holomorphy.com)
Thu, 7 Feb 2002 22:50:36 -0800


Well, this at least shuts up a warning coming from aha1542.c
setup_str[] is just not needed #ifdef MODULE Not sure what else might
be going on with this, but if the patch looks good to you, here it is.

Cheers,
Bill

--- linux/drivers/scsi/aha1542.c.orig Thu Feb 7 22:34:49 2002
+++ linux/drivers/scsi/aha1542.c Thu Feb 7 22:35:30 2002
@@ -111,8 +111,6 @@
static int setup_busoff[MAXBOARDS];
static int setup_dmaspeed[MAXBOARDS] __initdata = { -1, -1, -1, -1 };

-static char *setup_str[MAXBOARDS] __initdata;
-
/*
* LILO/Module params: aha1542=<PORTBASE>[,<BUSON>,<BUSOFF>[,<DMASPEED>]]
*
@@ -959,6 +957,7 @@
}

#ifndef MODULE
+static char *setup_str[MAXBOARDS] __initdata;
static int setup_idx = 0;

void __init aha1542_setup(char *str, int *ints)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/