diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/sk_mca.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'drivers/net/sk_mca.h')
| -rw-r--r-- | drivers/net/sk_mca.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sk_mca.h b/drivers/net/sk_mca.h index d6fa1823dfa..0dae056fed9 100644 --- a/drivers/net/sk_mca.h +++ b/drivers/net/sk_mca.h @@ -25,11 +25,11 @@ typedef struct { int nextrx; /* index of next RX descriptor to be read */ int nexttxput; /* index of next free TX descriptor */ - int nexttxdone; /* index of next TX descriptor to + int nexttxdone; /* index of next TX descriptor to be finished */ int txbusy; /* # of busy TX descriptors */ struct net_device_stats stat; /* packet statistics */ - int realirq; /* memorizes actual IRQ, even when + int realirq; /* memorizes actual IRQ, even when currently not allocated */ skmca_medium medium; /* physical cannector */ spinlock_t lock; |