diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /drivers/net/ibmveth.h | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
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; |