From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Thu, 9 Feb 2006 02:23:00 +0000 (+0100)
Subject: Merge: Corrected conditional for "virtual" board inclusion in the board list.
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~34
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/012f4747bffad9d61a1909969bc94b6802b1f068?hp=03b8cc18d9bed33c32700ca0aef759ecffde10c3

Merge: Corrected conditional for "virtual" board inclusion in the board list.

Merge commit 'remotes/sf-ocera-lincan/master'
---

diff --git a/lincan/src/boardlist.c b/lincan/src/boardlist.c
index 6d2cd8b..0f0d5cc 100644
--- a/lincan/src/boardlist.c
+++ b/lincan/src/boardlist.c
@@ -48,7 +48,7 @@ const struct boardtype_t can_boardtypes[]={
     #ifdef CONFIG_OC_LINCAN_CARD_template
 	{"template", template_register, 1},
     #endif
-    #ifdef CONFIG_OC_LINCAN_CARD_template
+    #ifdef CONFIG_OC_LINCAN_CARD_virtual
 	{"virtual", virtual_register, 0},
     #endif
     #ifdef CONFIG_OC_LINCAN_CARD_oscar