| From 536dc54d00e50e92557db93b9e7964c27bfc7d57 Mon Sep 17 00:00:00 2001 |
| From: Ruben Smits <ruben.smits@mech.kuleuven.be> |
| Date: Sat, 11 Dec 2010 08:26:18 +0100 |
| Subject: [PATCH] staging: comedi: add support for newer jr3 1-channel pci |
| board |
| |
| commit 6292817d58637f85dd623cfe563c7f5ec4f4c470 upstream. |
| |
| add DEVICE_ID to table |
| |
| Signed-off-by: Ruben Smits <ruben.smits@mech.kuleuven.be> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c |
| index d330b18..db31dfb 100644 |
| --- a/drivers/staging/comedi/drivers/jr3_pci.c |
| +++ b/drivers/staging/comedi/drivers/jr3_pci.c |
| @@ -53,6 +53,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci) |
| |
| #define PCI_VENDOR_ID_JR3 0x1762 |
| #define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111 |
| +#define PCI_DEVICE_ID_JR3_1_CHANNEL_NEW 0x1111 |
| #define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112 |
| #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 |
| #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 |
| @@ -72,6 +73,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { |
| { |
| PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL, |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
| + PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW, |
| + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
| PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL, |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
| PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL, |
| @@ -808,6 +811,10 @@ static int jr3_pci_attach(struct comedi_device *dev, |
| devpriv->n_channels = 1; |
| } |
| break; |
| + case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW:{ |
| + devpriv->n_channels = 1; |
| + } |
| + break; |
| case PCI_DEVICE_ID_JR3_2_CHANNEL:{ |
| devpriv->n_channels = 2; |
| } |
| -- |
| 1.7.4.4 |
| |
