diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-23 12:57:17 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-13 14:32:30 -0700 |
commit | 9548b735df211550f390d9dcecf9ea0bfc8a585e (patch) | |
tree | 9c93006b8918abf28032a89c0ff8102107ca0a77 | |
parent | 7258cb65dee6e568f77c42673380ea45c2c27dc1 (diff) |
staging: comedi: ni_labpc: remove 'device_id' from boardinfo
This information in the boardinfo is not used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.h | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h index 615f16f271c0..b0327c53603b 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.h +++ b/drivers/staging/comedi/drivers/ni_labpc.h @@ -34,7 +34,6 @@ enum transfer_type { fifo_not_empty_transfer, fifo_half_full_transfer, struct labpc_boardinfo { const char *name; - int device_id; /* device id for pci and pcmcia boards */ int ai_speed; /* maximum input speed in nanoseconds */ /* 1200 has extra registers compared to pc+ */ diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 9e3737c6918d..5f8de1142099 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -76,7 +76,6 @@ NI manuals: static const struct labpc_boardinfo labpc_cs_boards[] = { { .name = "daqcard-1200", - .device_id = 0x103, .ai_speed = 10000, .register_layout = labpc_1200_layout, .has_ao = 1, |