diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-28 10:19:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-28 10:19:40 +0200 |
| commit | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (patch) | |
| tree | fe3dc41cbb47ae12b7c3faf6a88b097349e50d5a /drivers/net/s2io.h | |
| parent | bnx2x: Update version (diff) | |
| parent | ipv6 route: Convert rt6_device_match() to use RT6_LOOKUP_F_xxx flags. (diff) | |
| download | linux-1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9.tar.xz linux-1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl4965-base.c
Diffstat (limited to 'drivers/net/s2io.h')
| -rw-r--r-- | drivers/net/s2io.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index d0a84ba887a5..483b17c34ae8 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h @@ -75,10 +75,6 @@ static int debug_level = ERR_DBG; /* DEBUG message print. */ #define DBG_PRINT(dbg_level, args...) if(!(debug_level<dbg_level)) printk(args) -#ifndef DMA_ERROR_CODE -#define DMA_ERROR_CODE (~(dma_addr_t)0x0) -#endif - /* Protocol assist features of the NIC */ #define L3_CKSUM_OK 0xFFFF #define L4_CKSUM_OK 0xFFFF |