diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-10 19:24:41 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-10 19:24:41 +1100 |
commit | 508a33134ac34fe15594a20d814bf22544936e2c (patch) | |
tree | bb552dbec42cca58acba251795c42ae8e7c8838f /drivers/staging/comedi/comedi.h | |
parent | bbf4250b38fe70bed68c39ed6493a0eef387842f (diff) | |
parent | 81f78f98a26760b10da647a05e62c8f67439bc58 (diff) |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/comedi/comedi.h')
-rw-r--r-- | drivers/staging/comedi/comedi.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 36d2e1b01e78..14b376c8e800 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -261,10 +261,11 @@ enum configuration_ids { INSN_CONFIG_GET_CLOCK_SRC = 2004, /* Get master clock source */ INSN_CONFIG_SET_OTHER_SRC = 2005, /* Set other source */ /* INSN_CONFIG_GET_OTHER_SRC = 2006,*/ /* Get other source */ - INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE, /* Get size in bytes of - subdevice's on-board fifos - used during streaming - input/output */ + INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE = 2006, /* Get size in bytes of + subdevice's on-board + fifos used during + streaming + input/output */ INSN_CONFIG_SET_COUNTER_MODE = 4097, INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, /* deprecated */ INSN_CONFIG_8254_READ_STATUS = 4098, |