Correct other references to ethtool-copy.h.

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f8c4f1ff..ff5f2841a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-10  Chris Lumens  <clumens@redhat.com>
+
+	* isys/ethtool.c:  Remove reference to ethtool-copy.h.
+	* isys/net.h:  Use linux/ethtool.h instead.
+
 2006-02-10  David Cantrell  <dcantrell@redhat.com>
 
 	* textw/progress_text.py (InstallProgressWindow.setPackage):  If a
diff --git a/isys/ethtool.c b/isys/ethtool.c
index cc7bdc704..bc4707c22 100644
--- a/isys/ethtool.c
+++ b/isys/ethtool.c
@@ -30,7 +30,6 @@ typedef void * caddr_t;
 
 #include <linux/sockios.h>
 #include "net.h"
-#include "ethtool-copy.h"
 
 static int set_intf_up(struct ifreq ifr, int sock) {
     if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
diff --git a/isys/net.h b/isys/net.h
index d0a03a659..96029825f 100644
--- a/isys/net.h
+++ b/isys/net.h
@@ -1,6 +1,8 @@
 #ifndef ISYSNET_H
 #define ISYSNET_H
 
+#include <linux/ethtool.h>
+
 /* type definitions so that the kernel-ish includes can be shared */
 #ifndef uint8_t
 #  define uint8_t       unsigned char
@@ -19,8 +21,6 @@ typedef uint32_t u32;
 typedef uint16_t u16;
 typedef uint8_t u8;
 
-#include "ethtool-copy.h"
-
 /* returns 1 for link, 0 for no link, -1 for unknown */
 int get_link_status(char *ifname);