---

yaml --- r: 150311 b: refs/heads/master c: 3878fb6 h: refs/heads/master i: 150309: 7d98345 150307: cb26f73 150303: da1f7b2 v: v3
git-mirror · May 18, 2009 · 9a7be61 · 9a7be61
1 parent 0e0b757
commit 9a7be61
Show file tree

Hide file tree

Showing 4 changed files with 420 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a61a8423c71d6da6f1f6f854d8adcea24b80bef6
+refs/heads/master: 3878fb6fdbceecca20b15748f807340854220f06
diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig
@@ -58,6 +58,13 @@ config CAN_EMS_PCI
 	  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).
 
+config CAN_KVASER_PCI
+	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
+	depends on PCI && CAN_SJA1000
+	---help---
+	  This driver is for the the PCIcanx and PCIcan cards (1, 2 or
+	  4 channel) from Kvaser (http://www.kvaser.com).
+
 config CAN_DEBUG_DEVICES
 	bool "CAN devices debugging messages"
 	depends on CAN

diff --git a/trunk/drivers/net/can/sja1000/Makefile b/trunk/drivers/net/can/sja1000/Makefile
@@ -5,5 +5,6 @@
 obj-$(CONFIG_CAN_SJA1000) += sja1000.o
 obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o
 obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o
+obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG