diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/isdn/mISDN/dsp.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/isdn/mISDN/dsp.h')
| -rw-r--r-- | drivers/isdn/mISDN/dsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h index 18af86879c05..8549431430f0 100644 --- a/drivers/isdn/mISDN/dsp.h +++ b/drivers/isdn/mISDN/dsp.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | /* options may be: | 21 | /* options may be: |
| 22 | * | 22 | * |
| 23 | * bit 0 = use ulaw instead of alaw | 23 | * bit 0 = use ulaw instead of alaw |
| 24 | * bit 1 = enable hfc hardware accelleration for all channels | 24 | * bit 1 = enable hfc hardware acceleration for all channels |
| 25 | * | 25 | * |
| 26 | */ | 26 | */ |
| 27 | #define DSP_OPT_ULAW (1<<0) | 27 | #define DSP_OPT_ULAW (1<<0) |