Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / Makefile.omk

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index 2d80d9a717c87b7682785402a9bf25b759f25046..29e0ba4da2dcfdd5fa2163130756654faf83eb61 100644 (file)
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,6 +1,6 @@
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
                pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io pikronisa eb8245 \
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
                pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io pikronisa eb8245 \

-               kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican virtual template
+               kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan virtual template

 
 lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760
 
 
 lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760
 


@@ -37,6 +37,10 @@ ifeq ($(CONFIG_OC_LINCAN_CARD_sh7760),y)
 lincan_cards_SOURCES += sh7760.c
 endif
 
 lincan_cards_SOURCES += sh7760.c
 endif
 

+ifeq ($(CONFIG_OC_LINCAN_CARD_usbcan),y)
+lincan_cards_SOURCES += kthread.c
+endif
+

 ifneq ($(filter hms30c7202_can ns_dev_can,$(lincan_cards_SELECTED)),)
 $(warning Not finished C_CAN support requested)
 lincan_cards_SOURCES += c_can.c c_can_irq.c
 ifneq ($(filter hms30c7202_can ns_dev_can,$(lincan_cards_SELECTED)),)
 $(warning Not finished C_CAN support requested)
 lincan_cards_SOURCES += c_can.c c_can_irq.c