diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /drivers/net/ibmveth.h | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'drivers/net/ibmveth.h')
| -rw-r--r-- | drivers/net/ibmveth.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h index f5b25bff1540..bb69ccae8ace 100644 --- a/drivers/net/ibmveth.h +++ b/drivers/net/ibmveth.h | |||
| @@ -118,7 +118,6 @@ struct ibmveth_adapter { | |||
| 118 | struct net_device_stats stats; | 118 | struct net_device_stats stats; |
| 119 | unsigned int mcastFilterSize; | 119 | unsigned int mcastFilterSize; |
| 120 | unsigned long mac_addr; | 120 | unsigned long mac_addr; |
| 121 | unsigned long liobn; | ||
| 122 | void * buffer_list_addr; | 121 | void * buffer_list_addr; |
| 123 | void * filter_list_addr; | 122 | void * filter_list_addr; |
| 124 | dma_addr_t buffer_list_dma; | 123 | dma_addr_t buffer_list_dma; |