diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/Documentation/sound/oss | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/Documentation/sound/oss')
| -rw-r--r-- | kernel/Documentation/sound/oss/PSS-updates | 2 | ||||
| -rw-r--r-- | kernel/Documentation/sound/oss/README.OSS | 2 | ||||
| -rw-r--r-- | kernel/Documentation/sound/oss/btaudio | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/Documentation/sound/oss/PSS-updates b/kernel/Documentation/sound/oss/PSS-updates index c84dd7597..11914a1dc 100644 --- a/kernel/Documentation/sound/oss/PSS-updates +++ b/kernel/Documentation/sound/oss/PSS-updates @@ -41,7 +41,7 @@ pss_no_sound This module parameter is a flag that can be used to tell the driver to just configure non-sound components. 0 configures all components, a non-0 -value will only attept to configure the CDROM and joystick ports. This +value will only attempt to configure the CDROM and joystick ports. This parameter can be used by a user who only wished to use the builtin joystick and/or CDROM port(s) of his PSS sound card. If this driver is loaded with this parameter and with the parameter below set to true then a user can safely unload diff --git a/kernel/Documentation/sound/oss/README.OSS b/kernel/Documentation/sound/oss/README.OSS index 4be259428..a085ea361 100644 --- a/kernel/Documentation/sound/oss/README.OSS +++ b/kernel/Documentation/sound/oss/README.OSS @@ -1346,7 +1346,7 @@ implement nice real-time signal processing audio effect software and network telephones. The ACI mixer has to be switched into the "solo" mode for duplex operation in order to avoid feedback caused by the mixer (input hears output signal). You can de-/activate this mode -through toggleing the record button for the wave controller with an +through toggling the record button for the wave controller with an OSS-mixer. The PCM20 contains a radio tuner, which is also controlled by diff --git a/kernel/Documentation/sound/oss/btaudio b/kernel/Documentation/sound/oss/btaudio index 1a693e69d..effdb9a3f 100644 --- a/kernel/Documentation/sound/oss/btaudio +++ b/kernel/Documentation/sound/oss/btaudio @@ -29,7 +29,7 @@ Driver Status Still somewhat experimental. The driver should work stable, i.e. it should'nt crash your box. It might not work as expected, have bugs, -not being fully OSS API compilant, ... +not being fully OSS API compliant, ... Latest versions are available from http://bytesex.org/bttv/, the driver is in the bttv tarball. Kernel patches might be available too, |