Skip to content

Commit

Permalink
ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface
Browse files Browse the repository at this point in the history
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 <haas@ems-wuensche.com>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sebastian Haas authored and David S. Miller committed Sep 21, 2009
1 parent c1e815c commit 702171a
Show file tree
Hide file tree
Showing 4 changed files with 1,169 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ config CAN_EMS_PCI
CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
(http://www.ems-wuensche.de).

config CAN_EMS_USB
tristate "EMS CPC-USB/ARM7 CAN/USB interface"
depends on USB && CAN_DEV
---help---
This driver is for the one channel CPC-USB/ARM7 CAN/USB interface
from 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
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/can/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o
obj-$(CONFIG_CAN_DEV) += can-dev.o
can-dev-y := dev.o

obj-y += usb/

obj-$(CONFIG_CAN_SJA1000) += sja1000/

ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
5 changes: 5 additions & 0 deletions drivers/net/can/usb/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Makefile for the Linux Controller Area Network USB drivers.
#

obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o
Loading

0 comments on commit 702171a

Please sign in to comment.