diff -urNp z/drivers/scsi/qla2xxx/qla2x00.c zz/drivers/scsi/qla2xxx/qla2x00.c
--- z/drivers/scsi/qla2xxx/qla2x00.c	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla2x00.c	Mon Jun 10 23:25:04 2002
@@ -31,9 +31,7 @@
 * Include files
 */
 #include <linux/config.h>
-#ifdef MODULE
 #include <linux/module.h>
-#endif
 
 #ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
@@ -252,12 +250,12 @@ static void qla2x00_dump_regs(struct Scs
 #if  STOP_ON_ERROR
 static void qla2x00_panic(char *, struct Scsi_Host *host);
 #endif
-void qla2x00_print_scsi_cmd(Scsi_Cmnd *cmd);
+static void qla2x00_print_scsi_cmd(Scsi_Cmnd *cmd);
 
 STATIC void qla2x00_abort_pending_queue(scsi_qla_host_t *ha, uint32_t stat);
 
 STATIC void qla2x00_mem_free(scsi_qla_host_t *ha);
-void qla2x00_do_dpc(void *p);
+STATIC void qla2x00_do_dpc(void *p);
 
 static inline void qla2x00_callback(scsi_qla_host_t *ha, Scsi_Cmnd *cmd);
 
@@ -353,12 +351,12 @@ qla2x00_notify_entry(scsi_qla_host_t *, 
 
 #endif  /* QLA2100_TARGET_MODE_SUPPORT */
 STATIC void qla2x00_display_fc_names(scsi_qla_host_t *ha);
-void qla2x00_dump_requests(scsi_qla_host_t *ha);
+static void qla2x00_dump_requests(scsi_qla_host_t *ha);
 static void qla2x00_get_properties(scsi_qla_host_t *ha, char *string);
 STATIC uint8_t qla2x00_find_propname(scsi_qla_host_t *ha, char *propname, char *propstr, char *db, int siz);
 static int qla2x00_get_prop_16chars(scsi_qla_host_t *ha, char *propname, char *propval, char *cmdline);
 static char	*qla2x00_get_line(char *str, char *line);
-void qla2x00_check_fabric_devices(scsi_qla_host_t *ha);
+static void qla2x00_check_fabric_devices(scsi_qla_host_t *ha);
 
 #ifdef FC_IP_SUPPORT
 
@@ -422,19 +420,20 @@ STATIC uint8_t qla2x00_32bit_start_scsi(
 STATIC uint8_t qla2x00_64bit_start_scsi(srb_t *sp);
 
 /* Routines for Failover */
-os_tgt_t * qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t, uint8_t *name);
+static os_tgt_t * qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t, uint8_t *name);
 #if  APIDEV
 static int apidev_init(struct Scsi_Host*);
 static int apidev_cleanup(void);
 #endif
-void qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t);
-os_lun_t * qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
+static void qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t);
+static os_lun_t * qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
 
 static void qla2x00_lun_free(scsi_qla_host_t *ha, uint16_t t, uint16_t l);
-void qla2x00_add_link_b(ql_list_head_t *head, ql_list_link_t *link);
-void qla2x00_add_link_t(ql_list_head_t *head, ql_list_link_t *link);
-void qla2x00_next(scsi_qla_host_t *vis_ha);
-void qla2x00_remove_link(ql_list_head_t *head, ql_list_link_t *link);
+static void qla2x00_add_link_b(ql_list_head_t *head, ql_list_link_t *link);
+static void qla2x00_add_link_t(ql_list_head_t *head, ql_list_link_t *link);
+
+static void qla2x00_next(scsi_qla_host_t *vis_ha);
+static void qla2x00_remove_link(ql_list_head_t *head, ql_list_link_t *link);
 static int qla2x00_build_fcport_list(scsi_qla_host_t *ha);
 static void qla2x00_config_os(scsi_qla_host_t *ha);
 static uint16_t qla2x00_fcport_bind(scsi_qla_host_t *ha, fc_port_t *fcport);
@@ -452,13 +451,13 @@ STATIC int qla2x00_device_reset(adapter_
 static int qla2x00_is_wwn_zero(uint8_t *nn);
 STATIC int qla2x00_marker(scsi_qla_host_t *, uint16_t , uint16_t ,
                           uint8_t );
-void qla2x00_get_lun_mask_from_config(scsi_qla_host_t *ha, fc_port_t *port,
+static void qla2x00_get_lun_mask_from_config(scsi_qla_host_t *ha, fc_port_t *port,
                                       uint16_t tgt, uint16_t dev_no);
-void 
+static void 
 qla2x00_print_q_info(os_lun_t *q);
 
 #if QLA2X_PERFORMANCE
-void qla2x00_done_tasklet(long p);
+static void qla2x00_done_tasklet(long p);
 #endif
 
 
@@ -467,7 +466,7 @@ STATIC void qla2x00_failover_cleanup(srb
 void qla2x00_flush_failover_q(scsi_qla_host_t *, os_lun_t *);
 #endif
 
-void qla2x00_chg_endian(uint8_t buf[], size_t size);
+static void qla2x00_chg_endian(uint8_t buf[], size_t size);
 STATIC uint8_t qla2x00_check_sense(Scsi_Cmnd       *cp, os_lun_t *);
 
 STATIC uint8_t 
@@ -505,8 +504,8 @@ qla2x00_dump_word(uint8_t *, uint32_t, u
 STATIC void qla2x00_sleep_done (struct semaphore * sem);
 #endif
 
-uint8_t qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
-void qla2x00_free_sp_pool(scsi_qla_host_t *ha );
+STATIC uint8_t qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
+STATIC void qla2x00_free_sp_pool(scsi_qla_host_t *ha );
 STATIC srb_t * qla2x00_get_new_sp (scsi_qla_host_t *ha);
 STATIC uint8_t qla2x00_check_tgt_status(scsi_qla_host_t *ha, Scsi_Cmnd *cmd);
 STATIC uint8_t qla2x00_check_port_status(scsi_qla_host_t *ha, fc_port_t *fcport);
@@ -516,7 +515,7 @@ STATIC void qla2x00_mark_all_devices_los
 
 
 /* Debug print buffer */
-char          debug_buff[LINESIZE*3];
+static char          debug_buff[LINESIZE*3];
 
 /*
 * insmod needs to find the variable and make it point to something
@@ -533,9 +532,10 @@ static int ConfigRequired = 0;
 static int recoveryTime = MAX_RECOVERYTIME;
 static int failbackTime = MAX_FAILBACKTIME;
 #endif	/* end of MPIO_SUPPORT */
+static int ql2xmaxqdepth = 0;
 #ifdef MODULE
 static char *ql2xopts = NULL;
-static int ql2xmaxqdepth = 0;
+static uint8_t copyright[48] = "Copyright 1999-2002, Qlogic Corporation";
 
 /* insmod qla2100 ql2xopts=verbose" */
 MODULE_PARM(ql2xopts, "s");
@@ -553,10 +553,6 @@ MODULE_PARM(failbackTime, "i");
 	 MODULE_LICENSE("GPL");
 #endif
 
-#include "listops.h"
-#include "qla_fo.cfg"
-
-
 /*
 * Just in case someone uses commas to separate items on the insmod
 * command line, we define a dummy buffer here to avoid having insmod
@@ -566,6 +562,10 @@ static char dummy_buffer[60] = "Please d
 
 #endif
 
+#include "listops.h"
+#include "qla_fo.cfg"
+
+
 #if QLA2100_LIPTEST
 static int qla2x00_lip = 0;
 #endif
@@ -613,8 +613,6 @@ static int qla2x00_lip = 0;
 
 #include "qla_debug.h"
 
-uint8_t copyright[48] = "Copyright 1999-2002, Qlogic Corporation";
-
 /****************************************************************************/
 /*  LINUX -  Loadable Module Functions.                                     */
 /****************************************************************************/
@@ -775,7 +773,7 @@ STATIC int qla2x00_retryq_dmp = 0;      
 *
 * Returns:
 *************************************************************************/
-int
+static int
 qla2x00_set_info(char *buffer, int length, struct Scsi_Host *HBAptr)
 {
 	return (-ENOSYS);  /* Currently this is a no-op */
@@ -806,7 +804,7 @@ qla2x00_set_info(char *buffer, int lengt
 * Returns:
 *************************************************************************/
 #define	PROC_BUF	(&qla2x00_buffer[len])
-int
+static int
 qla2x00_proc_info(char *buffer, char **start, off_t offset,
 	          int length, int hostno, int inout)
 {
@@ -1352,7 +1350,7 @@ __sp_put(struct scsi_qla_host * ha, srb_
 * None.
 * Note:Need to add the support for if( sp->state == SRB_FAILOVER_STATE).
 **************************************************************************/
-void
+static void
 qla2x00_cmd_timeout(srb_t *sp)
 {
 	int t, l;
@@ -1517,7 +1515,7 @@ qla2x00_cmd_timeout(srb_t *sp)
 * Returns:
 *     None.
 **************************************************************************/
-void
+static void
 qla2x00_add_timer_to_cmd(srb_t *sp, int timeout)
 {
 	init_timer(&sp->timer);
@@ -1539,7 +1537,7 @@ qla2x00_add_timer_to_cmd(srb_t *sp, int 
 * Returns:
 *     None.
 **************************************************************************/
-void
+static void
 qla2x00_delete_timer_from_cmd(srb_t *sp )
 {
 	if (sp->timer.function !=  NULL) {
@@ -1565,7 +1563,7 @@ qla2x00_delete_timer_from_cmd(srb_t *sp 
 * Returns:
 *  num - number of host adapters found.
 **************************************************************************/
-int
+static int
 qla2x00_detect(Scsi_Host_Template *template)
 {
 	device_reg_t	*reg;
@@ -2029,7 +2027,7 @@ qla2x00_register_with_Linux(scsi_qla_hos
 * Returns:
 *  0 - Always returns good status
 **************************************************************************/
-int
+static int
 qla2x00_release(struct Scsi_Host *host)
 {
 	scsi_qla_host_t *ha = (scsi_qla_host_t *) host->hostdata;
@@ -2137,7 +2135,7 @@ qla2x00_release(struct Scsi_Host *host)
 * Returns:
 *     Return a text string describing the driver.
 **************************************************************************/
-const char *
+static const char *
 qla2x00_info(struct Scsi_Host *host)
 {
 	static char qla2x00_buffer[255];
@@ -2331,7 +2329,7 @@ qla2x00_check_port_status(scsi_qla_host_
 * interrupt handler may call this routine as part of request-completion
 * handling).
 **************************************************************************/
-int
+static int
 qla2x00_queuecommand(Scsi_Cmnd *cmd, void (*fn)(Scsi_Cmnd *))
 {
 	fc_port_t	*fcport;
@@ -2581,7 +2579,7 @@ qla2x00_eh_wait_on_command(scsi_qla_host
 *
 * Note:
 **************************************************************************/
-int
+static int
 qla2xxx_eh_abort(Scsi_Cmnd *cmd)
 {
 	int		i;
@@ -2893,7 +2891,7 @@ qla2xxx_eh_abort(Scsi_Cmnd *cmd)
 *    SUCCESS/FAILURE (defined as macro in scsi.h).
 *
 **************************************************************************/
-int
+static int
 qla2xxx_eh_device_reset(Scsi_Cmnd *cmd)
 {
 	int         return_status = SUCCESS;
@@ -3017,7 +3015,7 @@ qla2xxx_eh_device_reset(Scsi_Cmnd *cmd)
 *    SUCCESS/FAILURE (defined as macro in scsi.h).
 *
 **************************************************************************/
-int
+static int
 qla2xxx_eh_bus_reset(Scsi_Cmnd *cmd)
 {
 	int        return_status = SUCCESS;
@@ -3139,7 +3137,7 @@ qla2xxx_eh_bus_reset(Scsi_Cmnd *cmd)
 *
 * Note:
 **************************************************************************/
-int
+static int
 qla2xxx_eh_host_reset(Scsi_Cmnd *cmd)
 {
 	int		return_status = SUCCESS;
@@ -3281,7 +3279,7 @@ qla2xxx_eh_host_reset(Scsi_Cmnd *cmd)
 * Description:
 *   Return the disk geometry for the given SCSI device.
 **************************************************************************/
-int
+static int
 qla2x00_biosparam(Disk *disk, kdev_t dev, int geom[])
 {
 	int heads, sectors, cylinders;
@@ -3310,7 +3308,7 @@ qla2x00_biosparam(Disk *disk, kdev_t dev
 *
 * Context: Interrupt
 **************************************************************************/
-void
+static void
 qla2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 	unsigned long flags = 0;
@@ -3429,7 +3427,7 @@ qla2x00_intr_handler(int irq, void *dev_
  *      p -- pointer to hba struct
  *
  */
-void
+static void
 qla2x00_done_tasklet(long p)
 {
 	scsi_qla_host_t *ha = (scsi_qla_host_t *) p;
@@ -3459,7 +3457,7 @@ qla2x00_done_tasklet(long p)
 * the timer routine detects a event it will one of the task
 * bits then wake us up.
 **************************************************************************/
-void
+static void
 qla2x00_do_dpc(void *p)
 {
 	DECLARE_MUTEX_LOCKED(sem);
@@ -3911,7 +3909,7 @@ qla2x00_do_dpc(void *p)
 *   as the default queue depth.  Otherwise, we use either 4 or 8 as the
 *   default queue depth (dependent on the number of hardware SCBs).
 **************************************************************************/
-void
+static void
 qla2x00_device_queue_depth(scsi_qla_host_t *p, Scsi_Device *device)
 {
 	int default_depth = 16;
@@ -4000,7 +3998,7 @@ qla2x00_disable_intrs(scsi_qla_host_t *h
 /*
  * Copy out of kernel space
  */
-int 
+static int 
 os_copyout(void *src,void *dst,size_t len,int mode)
 {
 	copy_to_user(dst,src,len);
@@ -4010,7 +4008,7 @@ os_copyout(void *src,void *dst,size_t le
 /*
  * Copy into kernel space
  */
-int 
+static int 
 os_copyin(void *src,void *dst, size_t len,int mode)
 {
 	copy_from_user(dst,src,len);
@@ -6578,7 +6576,7 @@ qla2x00_poll(scsi_qla_host_t *ha)
 * Returns:
 *      0 = success
 */
-int
+static int
 qla2x00_restart_isp(scsi_qla_host_t *ha)
 {
 	uint8_t status = 0;
@@ -11259,7 +11257,7 @@ qla2x00_reset_chip(scsi_qla_host_t *ha) 
  * This routine will wait for fabric devices for
  * the reset delay.
  */
-void qla2x00_check_fabric_devices(scsi_qla_host_t *ha) 
+static void qla2x00_check_fabric_devices(scsi_qla_host_t *ha) 
 {
 	uint16_t	fw_state;
 
@@ -13923,7 +13921,7 @@ qla2x00_tgt_alloc(scsi_qla_host_t *ha, u
  * Context:
  *	Kernel context.
  */
-void
+static void
 qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t) 
 {
 	os_tgt_t	*tq;
@@ -14094,7 +14092,7 @@ qla2x00_lun_free(scsi_qla_host_t *ha, ui
  * Context:
  *	Kernel context.
  */
-void
+static void
 qla2x00_add_link_b(ql_list_head_t *head, ql_list_link_t *link) 
 {
 	link->next = NULL;
@@ -14119,7 +14117,7 @@ qla2x00_add_link_b(ql_list_head_t *head,
  * Context:
  *	Kernel/Interrupt context.
  */
-void
+static void
 qla2x00_add_link_t(ql_list_head_t *head, ql_list_link_t *link) 
 {
 	link->prev = NULL;
@@ -14144,7 +14142,7 @@ qla2x00_add_link_t(ql_list_head_t *head,
  * Context:
  *	Kernel/Interrupt context.
  */
-void
+static void
 qla2x00_remove_link(ql_list_head_t *head, ql_list_link_t *link) 
 {
 	if (link->prev != NULL) {
@@ -14177,7 +14175,7 @@ qla2x00_remove_link(ql_list_head_t *head
  * 
  * Note: This routine will always try to start I/O from visible HBA.
  */
-void
+static void
 qla2x00_next(scsi_qla_host_t *vis_ha) 
 {
 	scsi_qla_host_t *dest_ha;
@@ -14474,7 +14472,7 @@ qla2x00_bstr_to_hex(char *s, uint8_t *bp
  * Context:
  *      Kernel context.
  */
-int
+static int
 qla2x00_get_prop_xstr(adapter_state_t *ha, 
 		char *propname, uint8_t *propval, int size) 
 {
@@ -14526,7 +14524,7 @@ qla2x00_get_prop_xstr(adapter_state_t *h
  * Context:
  *	Kernel context.
  */
-void
+static void
 qla2x00_chg_endian(uint8_t buf[], size_t size) 
 {
 	uint8_t byte;
@@ -14555,7 +14553,7 @@ qla2x00_chg_endian(uint8_t buf[], size_t
  * 
  * Note: Sets the ref_count for non Null sp to one.
  */
-uint8_t
+static uint8_t
 qla2x00_allocate_sp_pool( scsi_qla_host_t *ha) 
 {
 	srb_t   *sp;
@@ -14613,7 +14611,7 @@ qla2x00_allocate_sp_pool( scsi_qla_host_
  *  This routine frees all adapter allocated memory.
  *  
  */
-void
+static void
 qla2x00_free_sp_pool( scsi_qla_host_t *ha) 
 {
 	struct list_head *list, *temp;
@@ -14694,7 +14692,7 @@ qla2x00_dump_buffer(uint8_t * b, uint32_
  *   Input	 
  *	 cmd : Scsi_Cmnd
  **************************************************************************/
-void
+static void
 qla2x00_print_scsi_cmd(Scsi_Cmnd * cmd) 
 {
 	struct scsi_qla_host *ha;
@@ -14747,7 +14745,7 @@ qla2x00_print_scsi_cmd(Scsi_Cmnd * cmd) 
  * Input
  *      q: lun queue	 
  */ 
-void 
+static void 
 qla2x00_print_q_info(struct os_lun *q) 
 {
 	printk("Queue info: flags=0x%lx\n", q->q_flag);
@@ -14894,7 +14892,7 @@ qla2x00_panic(char *cp, struct Scsi_Host
 *   qla2x00_dump_requests
 *
 **************************************************************************/
-void
+static void
 qla2x00_dump_requests(scsi_qla_host_t *ha) 
 {
 
@@ -15184,7 +15182,7 @@ qla2x00_cfg_persistent_binding(adapter_s
  * kmem_zalloc
  * Allocate and zero out the block of memory
  */
-inline void *
+static inline void *
 kmem_zalloc( int siz, int code, int id) 
 {
 	uint8_t *bp;
@@ -15223,7 +15221,7 @@ kmem_free(void *ptr) 
 }
 #endif
 
-inline void 
+static inline void 
 qla_bcopy(unsigned char *dst, unsigned char *src, int siz) 
 {
 	int     i;
diff -urNp z/drivers/scsi/qla2xxx/qla2x00.h zz/drivers/scsi/qla2xxx/qla2x00.h
--- z/drivers/scsi/qla2xxx/qla2x00.h	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla2x00.h	Mon Jun 10 23:22:44 2002
@@ -2601,7 +2601,7 @@ typedef struct scsi_qla_host
 }
 #endif
 
-void qla2x00_device_queue_depth(scsi_qla_host_t *, Scsi_Device *);
+static void qla2x00_device_queue_depth(scsi_qla_host_t *, Scsi_Device *);
 #endif
 
 #if defined(__386__)
@@ -2613,20 +2613,20 @@ void qla2x00_device_queue_depth(scsi_qla
 /*
  *  Linux - SCSI Driver Interface Function Prototypes.
  */
-int qla2x00_ioctl(Scsi_Device *, int , void *);
-int qla2x00_proc_info ( char *, char **, off_t, int, int, int);
-const char * qla2x00_info(struct Scsi_Host *host);
-int qla2x00_detect(Scsi_Host_Template *);
-int qla2x00_release(struct Scsi_Host *);
-const char * qla2x00_info(struct Scsi_Host *);
-int qla2x00_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
+static int qla2x00_ioctl(Scsi_Device *, int , void *);
+static int qla2x00_proc_info ( char *, char **, off_t, int, int, int);
+static const char * qla2x00_info(struct Scsi_Host *host);
+static int qla2x00_detect(Scsi_Host_Template *);
+static int qla2x00_release(struct Scsi_Host *);
+static const char * qla2x00_info(struct Scsi_Host *);
+static int qla2x00_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
 int qla2x00_abort(Scsi_Cmnd *);
 int qla2x00_reset(Scsi_Cmnd *, unsigned int);
-int qla2x00_biosparam(Disk *, kdev_t, int[]);
-void qla2x00_intr_handler(int, void *, struct pt_regs *);
+static int qla2x00_biosparam(Disk *, kdev_t, int[]);
+static void qla2x00_intr_handler(int, void *, struct pt_regs *);
 #ifndef MODULE
 static int __init
-qla2100_setup (char *s)
+qla2x00_setup (char *s);
 #else
 void qla2x00_setup(char *s);
 #endif
diff -urNp z/drivers/scsi/qla2xxx/qla2x00_ioctl.c zz/drivers/scsi/qla2xxx/qla2x00_ioctl.c
--- z/drivers/scsi/qla2xxx/qla2x00_ioctl.c	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla2x00_ioctl.c	Mon Jun 10 23:09:20 2002
@@ -27,10 +27,10 @@
 #ifdef INTAPI
 #include "inioct.h"
 /* from qla_inioct.c */
-extern int qla2x00_read_nvram(adapter_state_t *, EXT_IOCTL *, int);
-extern int qla2x00_update_nvram(adapter_state_t *, EXT_IOCTL *, int);
-extern int qla2x00_write_nvram_word(adapter_state_t *, uint8_t, uint16_t);
-extern int qla2x00_send_loopback(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_read_nvram(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_update_nvram(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_write_nvram_word(adapter_state_t *, uint8_t, uint16_t);
+static int qla2x00_send_loopback(adapter_state_t *, EXT_IOCTL *, int);
 #endif
 
 
@@ -211,7 +211,7 @@ qla2x00_fcct_done(Scsi_Cmnd *pscsi_cmd)
  *   ret != 0    Failed; detailed status copied to EXT_IOCTL structure
  *               if applicable
  *************************************************************************/
-int
+STATIC int
 qla2x00_ioctl(Scsi_Device *dev, int cmd, void *arg)
 {
 	int		mode = 0;
diff -urNp z/drivers/scsi/qla2xxx/qla_fo.cfg zz/drivers/scsi/qla2xxx/qla_fo.cfg
--- z/drivers/scsi/qla2xxx/qla_fo.cfg	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla_fo.cfg	Mon Jun 10 23:12:39 2002
@@ -20,10 +20,10 @@
 /*
  * QLogic ISP2x00 Multi-path LUN Support Driver
  */
-int	MaxPathsPerDevice = 0;
-int	MaxRetriesPerPath =0 ;
-int	MaxRetriesPerIo =0;
 #ifdef MODULE
+static int	MaxPathsPerDevice = 0;
+static int	MaxRetriesPerPath =0 ;
+static int	MaxRetriesPerIo =0;
 /* insmod qla2100 <options> ql2xopts=<string> */
 MODULE_PARM(MaxPathsPerDevice, "i");
 MODULE_PARM(MaxRetriesPerPath, "i");
diff -urNp z/drivers/scsi/qla2xxx/qla_gbl.h zz/drivers/scsi/qla2xxx/qla_gbl.h
--- z/drivers/scsi/qla2xxx/qla_gbl.h	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla_gbl.h	Mon Jun 10 23:25:52 2002
@@ -38,7 +38,7 @@ extern "C"
         /*
          * Global Function Prototypes in qla2x00.c source file.
          */
-        extern int qla2x00_get_prop_xstr(adapter_state_t *, char *, uint8_t *, int);
+        static int qla2x00_get_prop_xstr(adapter_state_t *, char *, uint8_t *, int);
 
         extern void qla2x00_formatted_print(char *, uint64_t , uint8_t, uint8_t);
         extern void qla2x00_formatted_dump_buffer(char *, uint8_t *, uint8_t ,
@@ -54,8 +54,8 @@ extern "C"
         extern void qla2x00_fo_init_params(adapter_state_t *ha);
         extern BOOL qla2x00_fo_enabled(HBA_t *ha, int instance);
 #if defined(linux)
-        extern int os_copyout(void *src,void *dst,size_t len,int mode);
-        extern int os_copyin(void *src,void *dst,size_t len,int mode);
+        static int os_copyout(void *src,void *dst,size_t len,int mode);
+        static int os_copyin(void *src,void *dst,size_t len,int mode);
 #endif
 
         /*
@@ -85,8 +85,8 @@ extern "C"
         /*
          * Global Function Prototypes in qla_cfgln.c source file.
          */
-        extern inline void *kmem_zalloc( int siz, int code, int id);
-        extern inline void qla_bcopy(unsigned char *, unsigned char *, int );
+        static inline void *kmem_zalloc( int siz, int code, int id);
+        static inline void qla_bcopy(unsigned char *, unsigned char *, int );
         extern void qla2x00_cfg_build_path_tree( adapter_state_t *ha);
         extern BOOL qla2x00_update_mp_device(mp_host_t *,
                                                      fc_port_t  *, uint16_t	);
diff -urNp z/drivers/scsi/qla2xxx/qla_inioct.c zz/drivers/scsi/qla2xxx/qla_inioct.c
--- z/drivers/scsi/qla2xxx/qla_inioct.c	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla_inioct.c	Mon Jun 10 23:06:34 2002
@@ -19,15 +19,15 @@
 
 #include "inioct.h"
 
-extern int qla2x00_loopback_test(adapter_state_t *ha, INT_LOOPBACK_REQ *req,
+static int qla2x00_loopback_test(adapter_state_t *ha, INT_LOOPBACK_REQ *req,
     uint16_t *ret_mb);
 
-int qla2x00_read_nvram(adapter_state_t *, EXT_IOCTL *, int);
-int qla2x00_update_nvram(adapter_state_t *, EXT_IOCTL *, int);
-int qla2x00_write_nvram_word(adapter_state_t *, uint8_t, uint16_t);
-int qla2x00_send_loopback(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_read_nvram(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_update_nvram(adapter_state_t *, EXT_IOCTL *, int);
+static int qla2x00_write_nvram_word(adapter_state_t *, uint8_t, uint16_t);
+static int qla2x00_send_loopback(adapter_state_t *, EXT_IOCTL *, int);
 
-int
+static int
 qla2x00_read_nvram(adapter_state_t *ha, EXT_IOCTL *pext, int mode)
 {
 	uint8_t  *usr_temp, *kernel_tmp;
@@ -81,7 +81,7 @@ qla2x00_read_nvram(adapter_state_t *ha, 
  * Context:
  *	Kernel context.
  */
-int
+static int
 qla2x00_update_nvram(adapter_state_t *ha, EXT_IOCTL *pext, int mode)
 {
 	uint8_t i, cnt;
@@ -141,7 +141,7 @@ qla2x00_update_nvram(adapter_state_t *ha
 	return 0;
 }
 
-int
+static int
 qla2x00_write_nvram_word(adapter_state_t *ha, uint8_t addr, uint16_t data)
 {
 	int count;
@@ -217,7 +217,7 @@ qla2x00_write_nvram_word(adapter_state_t
 	return 0;
 }
 
-int
+static int
 qla2x00_send_loopback(adapter_state_t *ha, EXT_IOCTL *pext, int mode)
 {
 	int		status;
diff -urNp z/drivers/scsi/qla2xxx/qla_mbx.c zz/drivers/scsi/qla2xxx/qla_mbx.c
--- z/drivers/scsi/qla2xxx/qla_mbx.c	Mon Jun 10 23:31:08 2002
+++ zz/drivers/scsi/qla2xxx/qla_mbx.c	Mon Jun 10 22:49:13 2002
@@ -93,7 +93,7 @@ STATIC int
 qla2x00_get_retry_cnt(adapter_state_t *, uint8_t *, uint8_t *);
 
 #ifdef INTAPI
-int
+static int
 qla2x00_loopback_test(adapter_state_t *, INT_LOOPBACK_REQ *, uint16_t *);
 #endif