merge

Makefile.am

@@ -87,11 +87,8 @@ if ENABLE_TTY
 	$(MAKE) -C tty modules_install
 endif
 
-dist_pkgdata_DATA = $(LINUX_SYMVERS)
-
 clean-local:
 	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
-	@rm -f $(LINUX_SYMVERS)
 
 mydist:
 	hg log --style=changelog $(srcdir) > ChangeLog
@@ -105,7 +102,6 @@ dist-hook:
 
 mrproper: clean cleandoc
 	rm -rf \
-		$(LINUX_SYMVERS) \
 		*~ \
 		ChangeLog \
 		Doxyfile \

NEWS

@@ -24,6 +24,7 @@ Changes since 1.4.0:
     - Added e100 driver for 2.6.27.
     - Added e100 driver for 2.6.28, thanks to Kim. H. Madsen.
     - Added e100 driver for 2.6.29, thanks to Andre Puschmann.
+    - Added e100 driver for 2.6.31.
 * Added 8139too driver for kernels 2.6.25 (F. Pose), 2.6.26 (M. Luescher),
   2.6.27, 2.6.28 and 2.6.29 (M. Goetze).
 * Added e1000 driver for 2.6.26 (M. Luescher).
@@ -59,7 +60,6 @@ Changes since 1.4.0:
 * Changed EC_MAX_SII_SIZE to 4096.
 * 'ethercat xml' creates valid XML <EtherCATInfoList> for more than one slave
   (thanks to E. Burgstaller).
-* Module symbol versions file is installed to $prefix/share/ethercat.
 * Added 'ethercat eoe' command to display Ethernet over EtherCAT statistics.
 * Added 'ethercat cstruct' command to output PDO information in C language.
 * Significantly improved EoE bandwidth by running EoE processing in a kthread.

configure.ac

@@ -101,27 +101,6 @@ AC_SUBST(LINUX_KERNEL_VERSION,[$linuxversion])
 AC_SUBST(LINUX_MOD_PATH,[/lib/modules/$kernelrelease/ethercat])
 AC_MSG_RESULT([$LINUX_SOURCE_DIR (Kernel $LINUX_KERNEL_RELEASE)])
 
-#------------------------------------------------------------------------------
-# Determine the name of the symbol version file
-#------------------------------------------------------------------------------
-
-AC_MSG_CHECKING([for Linux symbol version file])
-
-symvers=
-for file in Module.symvers Modules.symvers; do
-	if test -f "$LINUX_SOURCE_DIR/$file"; then
-		symvers=$file
-		break
-	fi
-done
-
-AC_SUBST(LINUX_SYMVERS,[$symvers])
-if test -n "$symvers"; then
-	AC_MSG_RESULT([$LINUX_SYMVERS])
-else
-	AC_MSG_RESULT(["(none)"])
-fi
-
 #------------------------------------------------------------------------------
 # Generic Ethernet driver
 #------------------------------------------------------------------------------

devices/Makefile.am

@@ -71,6 +71,8 @@ noinst_HEADERS = \
 	e100-2.6.28-orig.c \
 	e100-2.6.29-ethercat.c \
 	e100-2.6.29-orig.c \
+	e100-2.6.31-ethercat.c \
+	e100-2.6.31-orig.c \
 	ecdev.h \
 	generic.c \
 	r8169-2.6.24-ethercat.c \