diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /Documentation/sound/alsa/SB-Live-mixer.txt | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'Documentation/sound/alsa/SB-Live-mixer.txt')
| -rw-r--r-- | Documentation/sound/alsa/SB-Live-mixer.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/SB-Live-mixer.txt b/Documentation/sound/alsa/SB-Live-mixer.txt index 651adaf60473..f5639d40521d 100644 --- a/Documentation/sound/alsa/SB-Live-mixer.txt +++ b/Documentation/sound/alsa/SB-Live-mixer.txt | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | The EMU10K1 chips have a DSP part which can be programmed to support | 6 | The EMU10K1 chips have a DSP part which can be programmed to support |
| 7 | various ways of sample processing, which is described here. | 7 | various ways of sample processing, which is described here. |
| 8 | (This acticle does not deal with the overall functionality of the | 8 | (This article does not deal with the overall functionality of the |
| 9 | EMU10K1 chips. See the manuals section for further details.) | 9 | EMU10K1 chips. See the manuals section for further details.) |
| 10 | 10 | ||
| 11 | The ALSA driver programs this portion of chip by default code | 11 | The ALSA driver programs this portion of chip by default code |