diff options
author | Sebastian Haas <haas@ems-wuensche.com> | 2009-07-21 15:38:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-23 21:01:02 -0400 |
commit | dd52856ba24ed2f67679c86f207e5a9bab1eb93b (patch) | |
tree | 613b683066df53b38d028a2e002e750b25d8fd19 /drivers/net/can/Kconfig | |
parent | 69222e2cb01ac3faaa8ca758c5ee036c191b8b9f (diff) |
can: sja1000: Add support for the new 4 channel EMS CPC-PCI cards
This patch adds support to the ems_pci driver for the new, v2,
4 channel CPC-PCI/PCIe/104P CAN cards from EMS Dr. Thomas Wuensche.
Signed-off-by: Sebastian Haas <haas@ems-wuensche.com>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/Kconfig')
-rw-r--r-- | drivers/net/can/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 33821a81cbf8..30ae55d71678 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig | |||
@@ -61,11 +61,12 @@ config CAN_SJA1000_OF_PLATFORM | |||
61 | you may want to enable this option. | 61 | you may want to enable this option. |
62 | 62 | ||
63 | config CAN_EMS_PCI | 63 | config CAN_EMS_PCI |
64 | tristate "EMS CPC-PCI and CPC-PCIe Card" | 64 | tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card" |
65 | depends on PCI && CAN_SJA1000 | 65 | depends on PCI && CAN_SJA1000 |
66 | ---help--- | 66 | ---help--- |
67 | This driver is for the one or two channel CPC-PCI and CPC-PCIe | 67 | This driver is for the one, two or four channel CPC-PCI, |
68 | cards from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de). | 68 | CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche |
69 | (http://www.ems-wuensche.de). | ||
69 | 70 | ||
70 | config CAN_KVASER_PCI | 71 | config CAN_KVASER_PCI |
71 | tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" | 72 | tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards" |