summaryrefslogtreecommitdiff
path: root/drivers/net/can/sja1000/Kconfig
diff options
context:
space:
mode:
authorStephane Grosjean <s.grosjean@peak-system.com>2012-03-02 19:21:19 +0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-03-03 20:40:39 +0400
commite6d9c80b7ca1504411ad6d7acdb8683e4ae1c9cd (patch)
tree0bb7a7b48fe5e79053b92708612ad1f10df0572c /drivers/net/can/sja1000/Kconfig
parent224223aaf9a44cd484019d2b765b6ca2beee6dd4 (diff)
downloadlinux-e6d9c80b7ca1504411ad6d7acdb8683e4ae1c9cd.tar.xz
can: peak_pci: add support of some new PEAK-System PCI cards
This patch adds the support of some new PEAK-System PCI cards in the CAN network sub-system. These are: PCAN-PCIeC (PCI-ExpressCard) PCAN-mminiPCI (mini-PCI) PCAN-PCI (PCI next-gen) This patch also adds the control of the blinking leds of the PCAN-PCIeC. Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/sja1000/Kconfig')
-rw-r--r--drivers/net/can/sja1000/Kconfig18
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index b21523ddff3c..fdc39261d464 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -44,11 +44,23 @@ config CAN_EMS_PCI
(http://www.ems-wuensche.de).
config CAN_PEAK_PCI
- tristate "PEAK PCAN PCI/PCIe Cards"
+ tristate "PEAK PCAN-PCI/PCIe/miniPCI 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).
+ This driver is for the PCAN-PCI/PCIe/miniPCI cards
+ (1, 2, 3 or 4 channels) from PEAK-System Technik
+ (http://www.peak-system.com).
+
+config CAN_PEAK_PCIEC
+ bool "PEAK PCAN-ExpressCard Cards"
+ depends on CAN_PEAK_PCI
+ select I2C
+ select I2C_ALGOBIT
+ default y
+ ---help---
+ Say Y here if you want to use a PCAN-ExpressCard from PEAK-System
+ Technik. This will also automatically select I2C and I2C_ALGO
+ configuration options.
config CAN_KVASER_PCI
tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"