# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1157720769 0
# Node ID 8d1fcfe68ced4363dfae96792e6b701fb42b6d74
# Parent  41bb29bf93e4cb61e275e48c5e58dd061891d0a0
MERGE trunk -r534:537 -> branches/stable-1.1 (INSTALL file, Version info)

diff -r 41bb29bf93e4 -r 8d1fcfe68ced INSTALL
--- a/INSTALL	Fri Sep 01 12:56:37 2006 +0000
+++ b/INSTALL	Fri Sep 08 13:06:09 2006 +0000
@@ -7,7 +7,10 @@
 -------------------------------------------------------------------------------
 
 Building and installing
-==========================
+=======================
+
+The first two steps are only necessary, if the kernel sources to compile
+against are not those of the running kernel.
 
 1) Create a copy of the configuration template:
 
@@ -28,7 +31,9 @@
     - /etc/init.d/ethercat    (startup script)
     - /usr/sbin/rcethercat    (link to startup script)
 
-  The modules will be placed in /lib/modules/<KERNEL>/kernel/drivers/net
+  The modules will be placed in /lib/modules/<KERNEL>/ethercat
   (where <KERNEL> is the Linux kernel version configured in ethercat.conf).
 
+5) Adjust the configuration file /etc/sysconfig/ethercat to your needs.
+
 -------------------------------------------------------------------------------
diff -r 41bb29bf93e4 -r 8d1fcfe68ced master/globals.h
--- a/master/globals.h	Fri Sep 01 12:56:37 2006 +0000
+++ b/master/globals.h	Fri Sep 08 13:06:09 2006 +0000
@@ -56,6 +56,15 @@
 /** master extra version (just a string) */
 #define EC_MASTER_VERSION_EXTRA "stable"
 
+/** Compile version info. */
+
+#define EC_COMPILE_INFO EC_STR(EC_MASTER_VERSION_MAIN) \
+                        "." EC_STR(EC_MASTER_VERSION_SUB) \
+                        " (" EC_MASTER_VERSION_EXTRA ")" \
+                        " - rev. " EC_STR(SVNREV) \
+                        ", compiled by " EC_STR(USER) \
+                        " at " __DATE__ " " __TIME__
+
 /** maximum number of FMMUs per slave */
 #define EC_MAX_FMMUS 16
 
diff -r 41bb29bf93e4 -r 8d1fcfe68ced master/master.c
--- a/master/master.c	Fri Sep 01 12:56:37 2006 +0000
+++ b/master/master.c	Fri Sep 08 13:06:09 2006 +0000
@@ -705,6 +705,7 @@
     ec_eoe_t *eoe;
     uint32_t cur, sum, min, max, pos, i;
 
+    off += sprintf(buffer + off, "\nVersion: " EC_COMPILE_INFO);
     off += sprintf(buffer + off, "\nMode: ");
     switch (master->mode) {
         case EC_MASTER_MODE_ORPHANED:
diff -r 41bb29bf93e4 -r 8d1fcfe68ced master/module.c
--- a/master/module.c	Fri Sep 01 12:56:37 2006 +0000
+++ b/master/module.c	Fri Sep 08 13:06:09 2006 +0000
@@ -53,19 +53,6 @@
 
 /*****************************************************************************/
 
-/**
-   Compile version info.
-*/
-
-#define COMPILE_INFO EC_STR(EC_MASTER_VERSION_MAIN) \
-                     "." EC_STR(EC_MASTER_VERSION_SUB) \
-                     " (" EC_MASTER_VERSION_EXTRA ")" \
-                     " - rev. " EC_STR(SVNREV) \
-                     ", compiled by " EC_STR(USER) \
-                     " at " __DATE__ " " __TIME__
-
-/*****************************************************************************/
-
 static int ec_master_count = 1; /**< parameter value, number of masters */
 static int ec_eoeif_count = 0; /**< parameter value, number of EoE interf. */
 static struct list_head ec_masters; /**< list of masters */
@@ -80,7 +67,7 @@
 MODULE_AUTHOR("Florian Pose <fp@igh-essen.com>");
 MODULE_DESCRIPTION("EtherCAT master driver module");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(COMPILE_INFO);
+MODULE_VERSION(EC_COMPILE_INFO);
 MODULE_PARM_DESC(ec_master_count, "number of EtherCAT masters to initialize");
 MODULE_PARM_DESC(ec_eoeif_count, "number of EoE interfaces per master");
 
@@ -99,7 +86,7 @@
     unsigned int i;
     ec_master_t *master, *next;
 
-    EC_INFO("Master driver, %s\n", COMPILE_INFO);
+    EC_INFO("Master driver, %s\n", EC_COMPILE_INFO);
 
     if (ec_master_count < 1) {
         EC_ERR("Error - Invalid ec_master_count: %i\n", ec_master_count);