---

yaml --- r: 290550 b: refs/heads/master c: bb47855 h: refs/heads/master v: v3
git-mirror · Mar 3, 2012 · 66f1aed · 66f1aed
1 parent 3054fbc
commit 66f1aed
Show file tree

Hide file tree

Showing 6 changed files with 1,107 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b61972b74219d21ef1e91178349bdb840357688
+refs/heads/master: bb4785551f64e18b2c8bb15a3bd2b22f5ebf624d
diff --git a/trunk/drivers/net/can/usb/Kconfig b/trunk/drivers/net/can/usb/Kconfig
@@ -13,4 +13,10 @@ config CAN_ESD_USB2
           This driver supports the CAN-USB/2 interface
           from esd electronic system design gmbh (http://www.esd.eu).
 
+config CAN_PEAK_USB
+	tristate "PEAK PCAN-USB/USB Pro interfaces"
+	---help---
+	  This driver supports the PCAN-USB and PCAN-USB Pro adapters
+	  from PEAK-System Technik (http://www.peak-system.com).
+
 endmenu
diff --git a/trunk/drivers/net/can/usb/Makefile b/trunk/drivers/net/can/usb/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o
 obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o
+obj-$(CONFIG_CAN_PEAK_USB) += peak_usb/
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/trunk/drivers/net/can/usb/peak_usb/Makefile b/trunk/drivers/net/can/usb/peak_usb/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_CAN_PEAK_USB) += peak_usb.o
+peak_usb-y = pcan_usb_core.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		obj-$(CONFIG_CAN_PEAK_USB) += peak_usb.o
		peak_usb-y = pcan_usb_core.o