Merge branch 'can-usb1' into spican1

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

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index a52f2d4e3edad19c9be5fb0d3cdb494a6d362e59..8ab77561e3b1f82b28a247b54de7368a8d8e4ae6 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -73,11 +73,13 @@ 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 omap2_spican_register(struct hwspecops_t *hwspecops);
 extern int pcan_pci_register(struct hwspecops_t *hwspecops);
 extern int esdpci200_register(struct hwspecops_t *hwspecops);
 extern int esdpci266_register(struct hwspecops_t *hwspecops);
 extern int sh7760_register(struct hwspecops_t *hwspecops);
 extern int mpc5200_register(struct hwspecops_t *hwspecops);
+extern int mpc5200_midam_register(struct hwspecops_t *hwspecops);
 
 const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_template
@@ -203,12 +205,12 @@ const struct boardtype_t can_boardtypes[]={
     #if defined(CONFIG_OC_LINCAN_CARD_usbcan)
        {"usbcan", usbcan_register, 0},
     #endif
+    #if defined(CONFIG_OC_LINCAN_CARD_omap2_spican)
+       {"omap2_spican", omap2_spican_register, 0},
+    #endif
     #if defined(CONFIG_OC_LINCAN_CARD_mpc5200)
        {"mpc5200", mpc5200_register, 0},
-    #else
-        #if defined(CONFIG_OC_LINCAN_CARD_mpc5200_midam)
-           {"mpc5200", mpc5200_register, 0},
-        #endif
+       {"mpc5200_midam", mpc5200_midam_register, 0},
     #endif
        {NULL}
 };