diff --git a/[refs] b/[refs] index f56a37541c4a..33217b83aabf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c350fa1944f4ec1fe392ce0f3fc879f3899bb15d +refs/heads/master: 655f78f6aaa059ad262bc55e1c3575724c14867b diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 601676139538..c5f7471a6b8b 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -435,14 +435,14 @@ static void pci9111_timer_set(struct comedi_device * dev) pci9111_8254_counter_1_set(dev_private->timer_divisor_1); } -typedef enum { +enum pci9111_trigger_sources { software, timer_pacer, external -} pci9111_trigger_sources; +}; static void pci9111_trigger_source_set(struct comedi_device * dev, - pci9111_trigger_sources source) + enum pci9111_trigger_sources source) { int flags;