git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8321d03)
Attempt to fix the build.
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 10 Nov 2008 16:42:35 +0000 (16:42 +0000)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 10 Nov 2008 16:42:35 +0000 (16:42 +0000)
linux-2.6-010-e1000e.patch patch | blob | history

diff --git a/linux-2.6-010-e1000e.patch b/linux-2.6-010-e1000e.patch
index d9deb5c..b5e3bae 100644 (file)
--- a/linux-2.6-010-e1000e.patch
+++ b/linux-2.6-010-e1000e.patch
@@ -17349,8 +17349,8 @@ diff -Nurp linux-2.6.22-0/drivers/net/e1000e/ethtool.c linux-2.6.22-10/drivers/n
 +#endif /* SIOCETHTOOL */
 diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.c linux-2.6.22-10/drivers/net/e1000e/kcompat.c
 --- linux-2.6.22-0/drivers/net/e1000e/kcompat.c        1970-01-01 01:00:00.000000000 +0100
 +#endif /* SIOCETHTOOL */
 diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.c linux-2.6.22-10/drivers/net/e1000e/kcompat.c
 --- linux-2.6.22-0/drivers/net/e1000e/kcompat.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-10/drivers/net/e1000e/kcompat.c       2008-10-14 01:51:32.000000000 +0200
-@@ -0,0 +1,318 @@
++++ linux-2.6.22-10/drivers/net/e1000e/kcompat.c       2008-11-10 17:29:35.000000000 +0100
+@@ -0,0 +1,319 @@
 +/*******************************************************************************
 +
 +  Intel PRO/1000 Linux driver
 +/*******************************************************************************
 +
 +  Intel PRO/1000 Linux driver
@@ -17380,6 +17380,7 @@ diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.c linux-2.6.22-10/drivers/n
 +*******************************************************************************/
 +
 +
 +*******************************************************************************/
 +
 +
++#define DRIVER_E1000E
 +
 +#ifdef DRIVER_E1000E
 +#include "e1000.h"
 +
 +#ifdef DRIVER_E1000E
 +#include "e1000.h"
@@ -18844,8 +18845,8 @@ diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat_ethtool.c linux-2.6.22-10/d
 +
 diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.h linux-2.6.22-10/drivers/net/e1000e/kcompat.h
 --- linux-2.6.22-0/drivers/net/e1000e/kcompat.h        1970-01-01 01:00:00.000000000 +0100
 +
 diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.h linux-2.6.22-10/drivers/net/e1000e/kcompat.h
 --- linux-2.6.22-0/drivers/net/e1000e/kcompat.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.22-10/drivers/net/e1000e/kcompat.h       2008-10-14 01:51:32.000000000 +0200
-@@ -0,0 +1,1627 @@
++++ linux-2.6.22-10/drivers/net/e1000e/kcompat.h       2008-11-10 17:29:48.000000000 +0100
+@@ -0,0 +1,1629 @@
 +/*******************************************************************************
 +
 +  Intel PRO/1000 Linux driver
 +/*******************************************************************************
 +
 +  Intel PRO/1000 Linux driver
@@ -18897,6 +18898,8 @@ diff -Nurp linux-2.6.22-0/drivers/net/e1000e/kcompat.h linux-2.6.22-10/drivers/n
 +#include <linux/mii.h>
 +#include <asm/io.h>
 +
 +#include <linux/mii.h>
 +#include <asm/io.h>
 +
++#define DRIVER_E1000E
++
 +/* NAPI enable/disable flags here */
 +
 +#ifdef DRIVER_E1000E
 +/* NAPI enable/disable flags here */
 +
 +#ifdef DRIVER_E1000E
linux-2.6