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/drivers/staging/speakup/speakup_acnt.h | |
| 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/drivers/staging/speakup/speakup_acnt.h')
| -rw-r--r-- | kernel/drivers/staging/speakup/speakup_acnt.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/drivers/staging/speakup/speakup_acnt.h b/kernel/drivers/staging/speakup/speakup_acnt.h index 6376fca9e..107ec1155 100644 --- a/kernel/drivers/staging/speakup/speakup_acnt.h +++ b/kernel/drivers/staging/speakup/speakup_acnt.h @@ -6,10 +6,12 @@ /* Port Status Flags */ #define SYNTH_READABLE 0x01 /* mask for bit which is nonzero if a - byte can be read from the data port */ + * byte can be read from the data port + */ #define SYNTH_WRITABLE 0x02 /* mask for RDY bit, which when set to - 1, indicates the data port is ready - to accept a byte of data. */ + * 1, indicates the data port is ready + * to accept a byte of data. + */ #define SYNTH_QUIET 'S' /* synth is not speaking */ #define SYNTH_FULL 'F' /* synth is full. */ #define SYNTH_ALMOST_EMPTY 'M' /* synth has less than 2 seconds of text left */ |