Skip to content

Commit 702171a

Browse files
Sebastian Haasdavem330
authored andcommitted
ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface
This patch adds support for one channel CAN/USB interace CPC-USB/ARM7 from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.com). Signed-off-by: Sebastian Haas <[email protected]> Signed-off-by: Wolfgang Grandegger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c1e815c commit 702171a

File tree

4 files changed

+1169
-0
lines changed

4 files changed

+1169
-0
lines changed

drivers/net/can/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ config CAN_EMS_PCI
7575
CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
7676
(http://www.ems-wuensche.de).
7777

78+
config CAN_EMS_USB
79+
tristate "EMS CPC-USB/ARM7 CAN/USB interface"
80+
depends on USB && CAN_DEV
81+
---help---
82+
This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
83+
from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
84+
7885
config CAN_KVASER_PCI
7986
tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
8087
depends on PCI && CAN_SJA1000

drivers/net/can/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o
77
obj-$(CONFIG_CAN_DEV) += can-dev.o
88
can-dev-y := dev.o
99

10+
obj-y += usb/
11+
1012
obj-$(CONFIG_CAN_SJA1000) += sja1000/
1113

1214
ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG

drivers/net/can/usb/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Makefile for the Linux Controller Area Network USB drivers.
3+
#
4+
5+
obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o

0 commit comments

Comments
 (0)