summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/Kconfig
diff options
context:
space:
mode:
authorSebastian Haas <haas@ems-wuensche.com>2009-07-21 21:38:13 +0200
committerDavid S. Miller <davem@davemloft.net>2009-07-24 03:01:02 +0200
commitdd52856ba24ed2f67679c86f207e5a9bab1eb93b (patch)
tree613b683066df53b38d028a2e002e750b25d8fd19 /drivers/net/can/Kconfig
parentdm9000: switch to dev_pm_ops (diff)
downloadlinux-dd52856ba24ed2f67679c86f207e5a9bab1eb93b.tar.xz
linux-dd52856ba24ed2f67679c86f207e5a9bab1eb93b.zip
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/Kconfig7
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
you may want to enable this option.
config CAN_EMS_PCI
- tristate "EMS CPC-PCI and CPC-PCIe Card"
+ tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"
depends on PCI && CAN_SJA1000
---help---
- This driver is for the one or two channel CPC-PCI and CPC-PCIe
- cards from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+ This driver is for the one, two or four channel CPC-PCI,
+ CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
+ (http://www.ems-wuensche.de).
config CAN_KVASER_PCI
tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"