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/ni52.h | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
| download | op-kernel-dev-363e065c02b1273364d5356711a83e7f548fc0c8.zip op-kernel-dev-363e065c02b1273364d5356711a83e7f548fc0c8.tar.gz | |
[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/ni52.h')
| -rw-r--r-- | drivers/net/ni52.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ni52.h b/drivers/net/ni52.h index 68f1917..a33ea08 100644 --- a/drivers/net/ni52.h +++ b/drivers/net/ni52.h @@ -11,7 +11,7 @@ * Garret A. Wollman's i82586-driver for BSD */ - + #define NI52_RESET 0 /* writing to this address, resets the i82586 */ #define NI52_ATTENTION 1 /* channel attention, kick the 586 */ #define NI52_TENA 3 /* 2-5 possibly wrong, Xmit enable */ @@ -151,7 +151,7 @@ struct rfd_struct /* * Receive Buffer Descriptor (RBD) */ -struct rbd_struct +struct rbd_struct { unsigned short status; /* status word,number of used bytes in buff */ unsigned short next; /* pointeroffset to next RBD */ @@ -203,7 +203,7 @@ struct nop_cmd_struct /* * IA Setup command */ -struct iasetup_cmd_struct +struct iasetup_cmd_struct { unsigned short cmd_status; unsigned short cmd_cmd; @@ -212,7 +212,7 @@ struct iasetup_cmd_struct }; /* - * Configure command + * Configure command */ struct configure_cmd_struct { @@ -234,9 +234,9 @@ struct configure_cmd_struct }; /* - * Multicast Setup command + * Multicast Setup command */ -struct mcsetup_cmd_struct +struct mcsetup_cmd_struct { unsigned short cmd_status; unsigned short cmd_cmd; @@ -257,9 +257,9 @@ struct dump_cmd_struct }; /* - * transmit command + * transmit command */ -struct transmit_cmd_struct +struct transmit_cmd_struct { unsigned short cmd_status; unsigned short cmd_cmd; |
