Merged Komax changes.

include/ecrt.h

@@ -208,8 +208,6 @@ typedef struct  {
 
 /*****************************************************************************/
 
-#ifndef __KERNEL__
-
 /** Master information.
  *
  * This is used as an output parameter of ecrt_master().
@@ -246,8 +244,6 @@ typedef struct {
     char name[EC_MAX_STRING_LENGTH]; /**< Name of the slave. */
 } ec_slave_info_t;
 
-#endif // #ifndef __KERNEL__
-
 /*****************************************************************************/
 
 /** Domain working counter interpretation.
@@ -539,8 +535,6 @@ ec_slave_config_t *ecrt_master_slave_config(
         uint32_t product_code /**< Expected product code. */
         );
 
-#ifndef __KERNEL__
-
 /** Obtains master information.
  *
  * No memory is allocated on the heap in
@@ -573,6 +567,8 @@ int ecrt_master_get_slave(
                                       information */
         );
 
+#ifndef __KERNEL__
+
 /** Returns the proposed configuration of a slave's sync manager.
  *
  * Fills a given ec_sync_info_t structure with the attributes of a sync