diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/can/usb | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/can/usb')
| -rw-r--r-- | drivers/net/can/usb/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/net/can/usb/Makefile | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig new file mode 100644 index 000000000000..bbc78e0b8a15 --- /dev/null +++ b/drivers/net/can/usb/Kconfig | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | menu "CAN USB interfaces" | ||
| 2 | depends on USB && CAN_DEV | ||
| 3 | |||
| 4 | config CAN_EMS_USB | ||
| 5 | tristate "EMS CPC-USB/ARM7 CAN/USB interface" | ||
| 6 | ---help--- | ||
| 7 | This driver is for the one channel CPC-USB/ARM7 CAN/USB interface | ||
| 8 | from from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de). | ||
| 9 | |||
| 10 | endmenu | ||
diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile index c3f75ba701b1..0afd51d4c7a5 100644 --- a/drivers/net/can/usb/Makefile +++ b/drivers/net/can/usb/Makefile | |||
| @@ -3,3 +3,5 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o | 5 | obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o |
| 6 | |||
| 7 | ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG | ||