diff --git a/[refs] b/[refs] index 56bf49bfe141..bb11c64fe62d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39f7666080909466c0ed6d5fa48cce3403033ced +refs/heads/master: 6ae9488bafce561c087310c051f92bbd0a27b891 diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c index 7cd88546b201..8ff7b986235b 100644 --- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c +++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c @@ -182,15 +182,15 @@ static int is_complete(volatile struct jr3_channel *channel) return get_s16(&channel->command_word0) == 0; } -typedef struct { +struct transform_t { struct { u16 link_type; s16 link_amount; } link[8]; -} transform_t; +}; static void set_transforms(volatile struct jr3_channel *channel, - transform_t transf, short num) + struct transform_t transf, short num) { int i; @@ -569,7 +569,7 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s) // Wait for offeset to stabilize (< 10 s according to manual) result = poll_delay_min_max(1000, 2000); } else { - transform_t transf; + struct transform_t transf; p->model_no = get_u16(&channel->model_no);