Merge master into can-usb1 branch to include proc update for 3.12+ kernels.

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

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index 7623ea353bc08e04c10742dd797a824543d3cd71..8cc67a0d6d49118ecf4933eda3e8d75d503d6c3f 100644 (file)
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -57,6 +57,7 @@ extern int ssv_register(struct hwspecops_t *hwspecops);
 extern int bfadcan_register(struct hwspecops_t *hwspecops);
 extern int gensja1000mm_register(struct hwspecops_t *hwspecops);
 extern int gensja1000io_register(struct hwspecops_t *hwspecops);
+extern int pcisja1000mm_register(struct hwspecops_t *hwspecops);
 extern int pimx1_register(struct hwspecops_t *hwspecops);
 extern int msmcan_register(struct hwspecops_t *hwspecops);
 extern int unican_register(struct hwspecops_t *hwspecops);
@@ -146,6 +147,9 @@ const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_gensja1000io
        {"gensja1000io", gensja1000io_register, 1},
     #endif
+    #ifdef CONFIG_OC_LINCAN_CARD_pcisja1000mm
+       {"pcisja1000mm", pcisja1000mm_register, 0},
+    #endif
     #ifdef CONFIG_OC_LINCAN_CARD_pimx1
        {"pimx1", pimx1_register, 0},
     #endif