From: cvs2git <feedback@pld-linux.org>
Date: Wed, 23 Jun 2004 07:25:59 +0000 (+0000)
Subject: This commit was manufactured by cvs2git to create branch 'RA-branch'.
X-Git-Tag: kernel-net-e1000-4_3_15-8~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fe1000.git;a=commitdiff_plain;h=48b31abcc8698adb568854015ac757131cdbd6e5

This commit was manufactured by cvs2git to create branch 'RA-branch'.

Cherrypick from master 2004-06-23 07:25:59 UTC ankry <ankry@pld-linux.org> '- alpha build fixes':
    kernel-net-e1000-alpha.patch -> 1.1
---

diff --git a/kernel-net-e1000-alpha.patch b/kernel-net-e1000-alpha.patch
new file mode 100644
index 0000000..5c238f2
--- /dev/null
+++ b/kernel-net-e1000-alpha.patch
@@ -0,0 +1,38 @@
+diff -ur e1000-4.3.15.orig/src/e1000.h e1000-4.3.15/src/e1000.h
+--- e1000-4.3.15.orig/src/e1000.h	Sat Aug 10 00:50:23 2002
++++ e1000-4.3.15/src/e1000.h	Wed Jun 23 09:05:31 2004
+@@ -37,6 +37,7 @@
+ 
+ #include <linux/stddef.h>
+ #include <linux/config.h>
++#include <asm/current.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <asm/byteorder.h>
+diff -ur e1000-4.3.15.orig/src/e1000_osdep.h e1000-4.3.15/src/e1000_osdep.h
+--- e1000-4.3.15.orig/src/e1000_osdep.h	Sat Aug 10 00:50:23 2002
++++ e1000-4.3.15/src/e1000_osdep.h	Wed Jun 23 09:05:31 2004
+@@ -34,10 +34,12 @@
+ #ifndef _E1000_OSDEP_H_
+ #define _E1000_OSDEP_H_
+ 
++#include <asm/current.h>
+ #include <linux/types.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+ #include <asm/io.h>
++#include <asm/spinlock.h>
+ #include <linux/interrupt.h>
+ #include "kcompat.h"
+ 
+diff -ur e1000-4.3.15.orig/src/kcompat.h e1000-4.3.15/src/kcompat.h
+--- e1000-4.3.15.orig/src/kcompat.h	Sat Aug 10 00:50:23 2002
++++ e1000-4.3.15/src/kcompat.h	Wed Jun 23 09:05:31 2004
+@@ -30,6 +30,7 @@
+ #define _KCOMPAT_H_
+ 
+ #include <linux/version.h>
++#include <asm/current.h>
+ #include <linux/types.h>
+ #include <linux/errno.h>
+ #define __NO_VERSION__