diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /pfinet/linux-src/include/linux/ixjuser.h | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'pfinet/linux-src/include/linux/ixjuser.h')
| -rw-r--r-- | pfinet/linux-src/include/linux/ixjuser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pfinet/linux-src/include/linux/ixjuser.h b/pfinet/linux-src/include/linux/ixjuser.h index a7019533..1ee0ee91 100644 --- a/pfinet/linux-src/include/linux/ixjuser.h +++ b/pfinet/linux-src/include/linux/ixjuser.h @@ -31,7 +31,7 @@ static char ixjuser_h_rcsid[] = "$Id: ixjuser.h,v 3.4 1999/12/16 22:18:36 root E /*************************************************************************** If you use the IXJCTL_TESTRAM command, the card must be power - cycled to reset the SRAM values before futher use. + cycled to reset the SRAM values before further use. ***************************************************************************/ #define IXJCTL_DSP_RESET _IO ('q', 0xC0) @@ -332,7 +332,7 @@ typedef struct { * This group of IOCTLs deal with the Acoustic Echo Cancellation settings * of the DSP * -* Issueing the IXJCTL_AEC_START command with a value of AEC_OFF has the +* Issuing the IXJCTL_AEC_START command with a value of AEC_OFF has the * same effect as IXJCTL_AEC_STOP. This is to simplify slider bar * controls. IXJCTL_AEC_GET_LEVEL returns the current setting of the AEC. ******************************************************************************/ |