diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/sbus/audio | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/sbus/audio')
| -rw-r--r-- | drivers/sbus/audio/amd7930.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/audio/dbri.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/audio/amd7930.c b/drivers/sbus/audio/amd7930.c index 4a0064f55..9b71e0a80 100644 --- a/drivers/sbus/audio/amd7930.c +++ b/drivers/sbus/audio/amd7930.c @@ -1021,7 +1021,7 @@ static int amd7930_ioctl(struct inode * inode, struct file * file, * * 0 - successful reception * non-0 - error value from chip's DER (D-Channel Error Register): - * 1 - recieved packet abort + * 1 - received packet abort * 2 - framing error; non-integer number of bytes received * 8 - FCS error; CRC sequence indicated corrupted data * 16 - overflow error; packet exceeded size of buffer diff --git a/drivers/sbus/audio/dbri.h b/drivers/sbus/audio/dbri.h index af3a8a4d7..363d0b225 100644 --- a/drivers/sbus/audio/dbri.h +++ b/drivers/sbus/audio/dbri.h @@ -305,7 +305,7 @@ struct dbri { #define DBRI_RD_M (1<<14) /* Marker interrupt */ #define DBRI_RD_BCNT(v) v /* Buffer size */ #define DBRI_RD_CRC (1<<7) /* 0: CRC is correct */ -#define DBRI_RD_BBC (1<<6) /* 1: Bad Byte recieved */ +#define DBRI_RD_BBC (1<<6) /* 1: Bad Byte received */ #define DBRI_RD_ABT (1<<5) /* Abort: frame aborted */ #define DBRI_RD_OVRN (1<<3) /* Overrun: data lost */ #define DBRI_RD_STATUS(v) ((v)&0xff) /* Receive status */ |