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_tones.c | |
| 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_tones.c')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_tones.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c index 7dbe54ed1de..4e4440e8bae 100644 --- a/drivers/isdn/mISDN/dsp_tones.c +++ b/drivers/isdn/mISDN/dsp_tones.c | |||
| @@ -394,7 +394,7 @@ void dsp_tone_copy(struct dsp *dsp, u8 *data, int len) | |||
| 394 | while (len) { | 394 | while (len) { |
| 395 | /* find sample to start with */ | 395 | /* find sample to start with */ |
| 396 | while (42) { | 396 | while (42) { |
| 397 | /* warp arround */ | 397 | /* wrap around */ |
| 398 | if (!pat->seq[index]) { | 398 | if (!pat->seq[index]) { |
| 399 | count = 0; | 399 | count = 0; |
| 400 | index = 0; | 400 | index = 0; |