Staging: vme: Allow drivers to co-exist

Unable to build both drivers at the same time due to classing variables that should be declared static but aren't.

Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 5799b09276869ac7a96b70a9c70a0312516187e1..47047985605455bafa2b8b2c507e6cee43273594 100644 (file)
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -41,21 +41,23 @@ static void __exit ca91cx42_exit(void);
 /* Module parameters */
 static int geoid;
 
-struct vme_bridge *ca91cx42_bridge;
-wait_queue_head_t dma_queue;
-wait_queue_head_t iack_queue;
-wait_queue_head_t lm_queue;
-wait_queue_head_t mbox_queue;
-
-void (*lm_callback[4])(int);    /* Called in interrupt handler, be careful! */
-void *crcsr_kernel;
-dma_addr_t crcsr_bus;
-
-struct mutex vme_rmw;   /* Only one RMW cycle at a time */
-struct mutex vme_int;   /*
-                        * Only one VME interrupt can be
-                        * generated at a time, provide locking
-                        */
+static struct vme_bridge *ca91cx42_bridge;
+static wait_queue_head_t dma_queue;
+static wait_queue_head_t iack_queue;
+#if 0
+static wait_queue_head_t lm_queue;
+#endif
+static wait_queue_head_t mbox_queue;
+
+static void (*lm_callback[4])(int);    /* Called in interrupt handler */
+static void *crcsr_kernel;
+static dma_addr_t crcsr_bus;
+
+static struct mutex vme_rmw;   /* Only one RMW cycle at a time */
+static struct mutex vme_int;   /*
+                                * Only one VME interrupt can be
+                                * generated at a time, provide locking
+                                */
 
 static char driver_name[] = "vme_ca91cx42";
 

diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 324cc389586fabcef420ed252308f597cfc3f9ae..4d19a914ec52b1f4fb13947e9cd14418f60902df 100644 (file)
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -62,19 +62,19 @@ int tsi148_generate_irq(int, int);
 int tsi148_slot_get(void);
 
 /* Modue parameter */
-int err_chk = 0;
+static int err_chk;
 static int geoid;
 
 /* XXX These should all be in a per device structure */
-struct vme_bridge *tsi148_bridge;
-wait_queue_head_t dma_queue[2];
-wait_queue_head_t iack_queue;
-void (*lm_callback[4])(int);   /* Called in interrupt handler, be careful! */
-void *crcsr_kernel;
-dma_addr_t crcsr_bus;
-struct vme_master_resource *flush_image;
-struct mutex vme_rmw;  /* Only one RMW cycle at a time */
-struct mutex vme_int;  /*
+static struct vme_bridge *tsi148_bridge;
+static wait_queue_head_t dma_queue[2];
+static wait_queue_head_t iack_queue;
+static void (*lm_callback[4])(int);    /* Called in interrupt handler */
+static void *crcsr_kernel;
+static dma_addr_t crcsr_bus;
+static struct vme_master_resource *flush_image;
+static struct mutex vme_rmw;   /* Only one RMW cycle at a time */
+static struct mutex vme_int;   /*
                                 * Only one VME interrupt can be
                                 * generated at a time, provide locking
                                 */