--- a/drivers/can_peak_win32/can_peak_win32.c	Fri Dec 07 18:22:41 2007 +0100
+++ b/drivers/can_peak_win32/can_peak_win32.c	Sat Dec 08 15:01:14 2007 +0100
@@ -71,13 +71,13 @@
 {
 	int baudrate;
 	
-//#ifdef PCAN2_HEADER_
+#ifdef PCAN2_HEADER_
 	// if not the first handler
 	if(second_board == (s_BOARD *)board)
 		if(baudrate = TranslateBaudeRate(board->baudrate))
 			CAN2_Init (baudrate,
 			  CAN_INIT_TYPE_ST extra_PCAN_init_params);
-//#endif
+#endif
 	if(first_board == (s_BOARD *)board)
 		if(baudrate = TranslateBaudeRate(board->baudrate))
 			CAN_Init (baudrate,
@@ -209,21 +209,25 @@
 {
   char busname[64];
   char* pEnd;
-
+	
   //printf ("Board Busname=%d.\n",strtol(board->busname, &pEnd,0));
   if (strtol(board->busname, &pEnd,0) == 0)
   {
       first_board = board;
       printf ("First Board selected\n");
+      canInit(board);	
+      return (CAN_HANDLE)board;
   }
+  #ifdef PCAN2_HEADER_
   if (strtol(board->busname, &pEnd,0) == 1)
   {
-     second_board = board;
-     printf ("Second Board selected\n");
+      second_board = board;
+      printf ("Second Board selected\n");
+      canInit(board);	
+      return (CAN_HANDLE)board;
   }
-	canInit(board);
-	
-	return (CAN_HANDLE)board;
+  #endif
+  return NULL;
 }
 
 /***************************************************************************/