---

yaml --- r: 141588 b: refs/heads/master c: b2e1b3c h: refs/heads/master v: v3
git-mirror · Apr 3, 2009 · 65dd072 · 65dd072
1 parent 2559489
commit 65dd072
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0306b0cb8e13d51c16adf9bc3285de80f6dc93b3
+refs/heads/master: b2e1b3c2bd6245c6d3d79f69fa94813b7db9a61e
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -130,7 +130,7 @@ MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
 typedef struct {
 	struct pci_dev *pci_dev;
 	int pci_enabled;
-	volatile jr3_t *iobase;
+	volatile struct jr3_t *iobase;
 	int n_channels;
 	struct timer_list timer;
 } jr3_pci_dev_private;
@@ -845,7 +845,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig *
 		return -EIO;
 	}
 	devpriv->pci_enabled = 1;
-	devpriv->iobase = ioremap(pci_resource_start(card, 0), sizeof(jr3_t));
+	devpriv->iobase = ioremap(pci_resource_start(card, 0), sizeof(struct jr3_t));
 	result = alloc_subdevices(dev, devpriv->n_channels);
 	if (result < 0)
 		goto out;

diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.h b/trunk/drivers/staging/comedi/drivers/jr3_pci.h
@@ -669,7 +669,7 @@ typedef struct force_sensor_data {
 	intern_transform_t transforms[0x10];	/* offset 0x0200 */
 } jr3_channel_t;
 
-typedef struct {
+struct jr3_t {
 	struct {
 		u32 program_low[0x4000];	/*  0x00000 - 0x10000 */
 		jr3_channel_t data;	/*  0x10000 - 0x10c00 */
@@ -678,4 +678,4 @@ typedef struct {
 		u32 reset;	/*  0x60000 - 0x60004 */
 		char pad3[0x20000 - 0x00004];	/*  0x60004 - 0x80000 */
 	} channel[4];
-} jr3_t;
+};