- merged from LINUX_2_6

[packages/kernel.git] / linux-2.6-forcedeth-WON.patch

diff --git a/linux-2.6-forcedeth-WON.patch b/linux-2.6-forcedeth-WON.patch
index 308471d5e418ea7307889cf1e6bf312a5dbf0138..c5bb8c1b44cb3d7d2227ea83713ae0abc82d6d43 100644 (file)
--- a/linux-2.6-forcedeth-WON.patch
+++ b/linux-2.6-forcedeth-WON.patch
@@ -1,15 +1,15 @@
 --- linux-2.6.19/drivers/net/forcedeth.c.orig   2006-09-20 05:42:06.000000000 +0200
 +++ linux-2.6.19/drivers/net/forcedeth.c        2006-11-25 14:19:31.000000000 +0100
-@@ -162,7 +162,8 @@
+@@ -166,7 +166,8 @@
   * Hardware access:
   */
  
--#define DEV_NEED_TIMERIRQ     0x0001  /* set the timer irq flag in the irq mask */
-+#define DEV_NEED_TIMERIRQ_ORIG        0x0001  /* set the timer irq flag in the irq mask */
-+#define DEV_NEED_TIMERIRQ     0x0000  /* work-around for Wake-On-Lan functionality */
- #define DEV_NEED_LINKTIMER    0x0002  /* poll link settings. Relies on the timer irq */
- #define DEV_HAS_LARGEDESC     0x0004  /* device supports jumbo frames and needs packet format 2 */
- #define DEV_HAS_HIGH_DMA        0x0008  /* device supports 64bit dma */
+-#define DEV_NEED_TIMERIRQ          0x000001  /* set the timer irq flag in the irq mask */
++#define DEV_NEED_TIMERIRQ_ORIG     0x000001  /* set the timer irq flag in the irq mask */
++#define DEV_NEED_TIMERIRQ          0x000000  /* work-around for Wake-On-Lan functionality */
+ #define DEV_NEED_LINKTIMER         0x000002  /* poll link settings. Relies on the timer irq */
+ #define DEV_HAS_LARGEDESC          0x000004  /* device supports jumbo frames and needs packet format 2 */
+ #define DEV_HAS_HIGH_DMA           0x000008  /* device supports 64bit dma */
 @@ -4342,7 +4343,7 @@
                        np->msi_flags |= 0x0001;
        }