merge

2009-10-28 13:18:07 +01:00 · 2009-10-28 13:18:07 +01:00 · 8d79bc2549
parent ed57943fd4 537370974e
commit 8d79bc2549
4 changed files with 6066 additions and 0 deletions
--- a/1
+++ b/1
@ -21,6 +21,7 @@ Changes since 1.4.0:
  Introduced new method ec_datagram_zero() for that.
 * Added phy_read and phy_write commands to ethercat tool.
 * Added e100 driver for Intel PRO/100 NICs.
+    - 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 8139too driver for kernels 2.6.25 (F. Pose), 2.6.26 (M. Luescher),
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@ -63,6 +63,8 @@ noinst_HEADERS = \
 	e100-2.6.24-orig.c \
 	e100-2.6.26-ethercat.c \
 	e100-2.6.26-orig.c \
+	e100-2.6.27-ethercat.c \
+	e100-2.6.27-orig.c \
 	e100-2.6.28-ethercat.c \
 	e100-2.6.28-orig.c \
 	e100-2.6.29-ethercat.c \
--- a/devices/e100-2.6.27-ethercat.c
+++ b/devices/e100-2.6.27-ethercat.c
--- a/devices/e100-2.6.27-orig.c
+++ b/devices/e100-2.6.27-orig.c