From 1996bd6f165432477005147a1cfc4a3789f1b2ac Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:16:34 -0400 Subject: [PATCH] --- yaml --- r: 141623 b: refs/heads/master c: c7ef22985517e35d3b5cf5cffa962a4b8ed8899b h: refs/heads/master i: 141621: cf8e3f0c2de9566fb884ba25ba87ca1abf7660b0 141619: df2170d73b28f63205c7972ba4a5fe9eac8f9b18 141615: 03ca706cbe562cc2e0d6e65e52b31963bf38618f v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_mio_cs.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6dfe08ad7ebd..5db3884ce3fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 344d23e931fdb982489753e5189d9c60ffbdfd67 +refs/heads/master: c7ef22985517e35d3b5cf5cffa962a4b8ed8899b diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c index 9822f5e70229..d6357c25aca5 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/trunk/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -173,11 +173,13 @@ static const ni_board ni_boards[] = { #define NI_E_IRQ_FLAGS IRQF_SHARED -typedef struct { +struct ni_private { + struct pcmcia_device *link; - NI_PRIVATE_COMMON} ni_private; -#define devpriv ((ni_private *)dev->private) + NI_PRIVATE_COMMON}; + +#define devpriv ((struct ni_private *)dev->private) /* How we access registers */