drivers/net/r8169.c:50:1: warning: "DMA_32BIT_MASK" redefined
In file included from include/asm-generic/pci-dma-compat.h:7,
                 from include/asm/pci.h:105,
                 from include/linux/pci.h:794,
                 from drivers/net/r8169.c:39:
include/linux/dma-mapping.h:14:1: warning: this is the location of the previous definition



---

 25-akpm/drivers/net/r8169.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN drivers/net/r8169.c~r8169-warning-fix drivers/net/r8169.c
--- 25/drivers/net/r8169.c~r8169-warning-fix	2004-04-07 22:28:26.205565560 -0700
+++ 25-akpm/drivers/net/r8169.c	2004-04-07 22:28:46.107540000 -0700
@@ -43,12 +43,10 @@ VERSION 1.2	<2002/11/30>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/io.h>
 
-#define DMA_64BIT_MASK 0xffffffffffffffffULL
-#define DMA_32BIT_MASK 0xffffffffULL
-
 #define RTL8169_VERSION "1.2"
 #define MODULENAME "r8169"
 #define RTL8169_DRIVER_NAME   MODULENAME " Gigabit Ethernet driver " RTL8169_VERSION

_