summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000/Kconfig
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@grandegger.com>2011-09-12 23:16:06 +0200
committerDavid S. Miller <davem@davemloft.net>2011-09-21 08:29:02 +0200
commit38034518c086fc48232b641cab97396a615864d0 (patch)
tree4b25baf8fcdf1661a21a838d23166b1fff0de739 /drivers/net/can/sja1000/Kconfig
parentnet/phy: add IC+ IP101A and support APS. (diff)
downloadlinux-38034518c086fc48232b641cab97396a615864d0.tar.xz
linux-38034518c086fc48232b641cab97396a615864d0.zip
can/sja1000: driver for PEAK PCAN PCI/PCIe cards
This patch add the peak_pci driver for the PCAN PCI/PCIe cards (1, 2, 3 or 4 channels) from PEAK Systems (http://www.peak-system.com). Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000/Kconfig')
-rw-r--r--drivers/net/can/sja1000/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 6fdc031daaae..72b637d31c91 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -37,6 +37,13 @@ config CAN_EMS_PCI
CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
(http://www.ems-wuensche.de).
+config CAN_PEAK_PCI
+ tristate "PEAK PCAN PCI/PCIe Cards"
+ depends on PCI
+ ---help---
+ This driver is for the PCAN PCI/PCIe cards (1, 2, 3 or 4 channels)
+ from PEAK Systems (http://www.peak-system.com).
+
config CAN_KVASER_PCI
tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
depends on PCI