diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /drivers/net/dgrs_ether.h | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
| download | linux-next-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.gz linux-next-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/dgrs_ether.h')
| -rw-r--r-- | drivers/net/dgrs_ether.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dgrs_ether.h b/drivers/net/dgrs_ether.h index 51596ce6cf84..7539b596bff8 100644 --- a/drivers/net/dgrs_ether.h +++ b/drivers/net/dgrs_ether.h @@ -49,7 +49,7 @@ typedef struct int buf_cnt; /* Total RBD's allocated */ /* Rx Statistics */ - ulong cnt_rx_cnt; /* Total packets rcvd, good and bad */ + ulong cnt_rx_cnt; /* Total packets rcvd, good and bad */ ulong cnt_rx_good; /* Total good packets rcvd */ ulong cnt_rx_bad; /* Total of all bad packets rcvd */ /* Subtotals can be gotten from SCB */ @@ -94,7 +94,7 @@ typedef struct * Filter 0: input filter * Filter 1: output filter */ - + ulong *filter_space[NFILTERS]; FILTER_FUNC *filter_func[NFILTERS]; ulong filter_cnt[NFILTERS]; |