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/3c523.h | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
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/3c523.h')
| -rw-r--r-- | drivers/net/3c523.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/3c523.h b/drivers/net/3c523.h index 7292f88b48e..6956441687b 100644 --- a/drivers/net/3c523.h +++ b/drivers/net/3c523.h @@ -130,7 +130,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 */ @@ -182,7 +182,7 @@ struct nop_cmd_struct /* * IA Setup command */ -struct iasetup_cmd_struct +struct iasetup_cmd_struct { unsigned short cmd_status; unsigned short cmd_cmd; @@ -191,7 +191,7 @@ struct iasetup_cmd_struct }; /* - * Configure command + * Configure command */ struct configure_cmd_struct { @@ -213,9 +213,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; @@ -225,9 +225,9 @@ struct mcsetup_cmd_struct }; /* - * transmit command + * transmit command */ -struct transmit_cmd_struct +struct transmit_cmd_struct { unsigned short cmd_status; unsigned short cmd_cmd; |