---

yaml --- r: 126733 b: refs/heads/master c: 39eca2a h: refs/heads/master i: 126731: 1346d20 v: v3
git-mirror · Jan 6, 2009 · 1555a11 · 1555a11
1 parent aea4507
commit 1555a11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e08c19867cefd9d1a1f07e309338b93439d147a
+refs/heads/master: 39eca2a087e30001b3679c04338976d3b02b9173
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -234,7 +234,7 @@ static const struct me_board me_boards[] = {
 		.ao_channel_nbr =	0,
 		.ao_resolution =	0,
 		.ao_resolution_mask =	0,
-		.ao_range_list =	0,
+		.ao_range_list =	NULL,
 		.ai_channel_nbr =	16,
 		/* Analog Input */
 		.ai_resolution =	12,
@@ -257,8 +257,8 @@ COMEDI_PCI_INITCLEANUP(me_driver, me_pci_table);
 /* Private data structure */
 struct me_private_data {
 	struct pci_dev *pci_device;
-	void *plx_regbase;	/* PLX configuration base address */
-	void *me_regbase;	/* Base address of the Meilhaus card */
+	void __iomem *plx_regbase;	/* PLX configuration base address */
+	void __iomem *me_regbase;	/* Base address of the Meilhaus card */
 	unsigned long plx_regbase_size;	/* Size of PLX configuration space */
 	unsigned long me_regbase_size;	/* Size of Meilhaus space */