Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / boardlist.c

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index 86f332ed878c374fd4895d4e1eeb3633d0ee558d..d7cf342df4f9da82ac5228751decd034e17eda7f 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -46,6 +46,7 @@ extern int ts7kv_register(struct hwspecops_t *hwspecops);
 extern int ns_dev_register(struct hwspecops_t *hwspecops);
 extern int hms30c7202_register(struct hwspecops_t *hwspecops);
 extern int nsi_canpci_register(struct hwspecops_t *hwspecops);
+extern int usbcan_register(struct hwspecops_t *hwspecops);
 extern int pcan_pci_register(struct hwspecops_t *hwspecops);
 extern int esdpci200_register(struct hwspecops_t *hwspecops);
 extern int sh7760_register(struct hwspecops_t *hwspecops);
@@ -167,6 +168,9 @@ const struct boardtype_t can_boardtypes[]={
     #endif
     #if defined(CONFIG_OC_LINCAN_CARD_pcan_pci)&&defined(CAN_ENABLE_PCI_SUPPORT)
        {"pcan_pci", pcan_pci_register, 0},
+    #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_usbcan)
+       {"usbcan", usbcan_register, 0},
     #endif
        {NULL}
 };