diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/net/chelsio/common.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/net/chelsio/common.h')
| -rw-r--r-- | drivers/net/chelsio/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index f09348802b46..bf3e7b6a7a18 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h | |||
| @@ -88,7 +88,7 @@ struct t1_rx_mode { | |||
| 88 | 88 | ||
| 89 | static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm) | 89 | static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm) |
| 90 | { | 90 | { |
| 91 | u8 *addr = 0; | 91 | u8 *addr = NULL; |
| 92 | 92 | ||
| 93 | if (rm->idx++ < rm->dev->mc_count) { | 93 | if (rm->idx++ < rm->dev->mc_count) { |
| 94 | addr = rm->list->dmi_addr; | 94 | addr = rm->list->dmi_addr; |
| @@ -190,7 +190,7 @@ struct sge; | |||
| 190 | struct peespi; | 190 | struct peespi; |
| 191 | 191 | ||
| 192 | struct adapter { | 192 | struct adapter { |
| 193 | u8 *regs; | 193 | u8 __iomem *regs; |
| 194 | struct pci_dev *pdev; | 194 | struct pci_dev *pdev; |
| 195 | unsigned long registered_device_map; | 195 | unsigned long registered_device_map; |
| 196 | unsigned long open_device_map; | 196 | unsigned long open_device_map; |