---

yaml --- r: 186510 b: refs/heads/master c: 12b2d5c h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 162ef1f · 162ef1f
1 parent aa81ea1
commit 162ef1f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 638f199db463a8f2b1535c45ab27d04bb1a55baf
+refs/heads/master: 12b2d5c0895a03e941e7c145d9d23a45908a857b
diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -38,6 +38,9 @@ static int ca91cx42_probe(struct pci_dev *, const struct pci_device_id *);
 static void ca91cx42_remove(struct pci_dev *);
 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;
@@ -881,8 +884,12 @@ int ca91cx42_slot_get(void)
 {
 	u32 slot = 0;
 
-	slot = ioread32(ca91cx42_bridge->base + VCSR_BS);
-	slot = ((slot & CA91CX42_VCSR_BS_SLOT_M) >> 27);
+	if (!geoid) {
+		slot = ioread32(ca91cx42_bridge->base + VCSR_BS);
+		slot = ((slot & CA91CX42_VCSR_BS_SLOT_M) >> 27);
+	} else
+		slot = geoid;
+
 	return (int)slot;
 
 }
@@ -1299,6 +1306,9 @@ static void __exit ca91cx42_exit(void)
 	pci_unregister_driver(&ca91cx42_driver);
 }
 
+MODULE_PARM_DESC(geoid, "Override geographical addressing");
+module_param(geoid, int, 0);
+
 MODULE_DESCRIPTION("VME driver for the Tundra Universe II VME bridge");
 MODULE_LICENSE("GPL");