diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/net/e1000/e1000.h | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/e1000/e1000.h')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index af1e82c5b808..092757bc721f 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
| @@ -140,7 +140,7 @@ struct e1000_adapter; | |||
| 140 | #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ | 140 | #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ |
| 141 | 141 | ||
| 142 | #define AUTO_ALL_MODES 0 | 142 | #define AUTO_ALL_MODES 0 |
| 143 | #define E1000_EEPROM_82544_APM 0x0400 | 143 | #define E1000_EEPROM_82544_APM 0x0004 |
| 144 | #define E1000_EEPROM_APME 0x0400 | 144 | #define E1000_EEPROM_APME 0x0400 |
| 145 | 145 | ||
| 146 | #ifndef E1000_MASTER_SLAVE | 146 | #ifndef E1000_MASTER_SLAVE |
| @@ -159,7 +159,7 @@ struct e1000_adapter; | |||
| 159 | * so a DMA handle can be stored along with the buffer */ | 159 | * so a DMA handle can be stored along with the buffer */ |
| 160 | struct e1000_buffer { | 160 | struct e1000_buffer { |
| 161 | struct sk_buff *skb; | 161 | struct sk_buff *skb; |
| 162 | uint64_t dma; | 162 | dma_addr_t dma; |
| 163 | unsigned long time_stamp; | 163 | unsigned long time_stamp; |
| 164 | uint16_t length; | 164 | uint16_t length; |
| 165 | uint16_t next_to_watch; | 165 | uint16_t next_to_watch; |