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>

diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h
index 615f16f271c0a8078a1a6a22339393ffdeddf2ed..b0327c53603b8d8dc52d300209215947d1c11ae7 100644 (file)
--- 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 9e3737c6918dc4e94d2b1d63ae2210ddc7d4a862..5f8de114209908c74ab1271c1dd736ae4dca2b1a 100644 (file)
--- 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,