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 /sound/isa/sb/emu8000.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 'sound/isa/sb/emu8000.c')
| -rw-r--r-- | sound/isa/sb/emu8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c index 0c40951b652..5d61f5a2913 100644 --- a/sound/isa/sb/emu8000.c +++ b/sound/isa/sb/emu8000.c | |||
| @@ -370,7 +370,7 @@ init_arrays(struct snd_emu8000 *emu) | |||
| 370 | 370 | ||
| 371 | /* | 371 | /* |
| 372 | * Size the onboard memory. | 372 | * Size the onboard memory. |
| 373 | * This is written so as not to need arbitary delays after the write. It | 373 | * This is written so as not to need arbitrary delays after the write. It |
| 374 | * seems that the only way to do this is to use the one channel and keep | 374 | * seems that the only way to do this is to use the one channel and keep |
| 375 | * reallocating between read and write. | 375 | * reallocating between read and write. |
| 376 | */ | 376 | */ |