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/dgnc/digi.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/dgnc/digi.h')
| -rw-r--r-- | kernel/drivers/staging/dgnc/digi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/drivers/staging/dgnc/digi.h b/kernel/drivers/staging/dgnc/digi.h index d637a7802..cf9dcae7c 100644 --- a/kernel/drivers/staging/dgnc/digi.h +++ b/kernel/drivers/staging/dgnc/digi.h @@ -130,19 +130,19 @@ struct digi_getcounter { #define BD_RUNNING 0x0 #define BD_NOFEP 0x5 -#define DIGI_SETCUSTOMBAUD _IOW('e', 106, int) /* Set integer baud rate */ -#define DIGI_GETCUSTOMBAUD _IOR('e', 107, int) /* Get integer baud rate */ +#define DIGI_SETCUSTOMBAUD _IOW('e', 106, int) /* Set integer baud rate */ +#define DIGI_GETCUSTOMBAUD _IOR('e', 107, int) /* Get integer baud rate */ #define DIGI_REALPORT_GETBUFFERS (('e'<<8) | 108) #define DIGI_REALPORT_SENDIMMEDIATE (('e'<<8) | 109) #define DIGI_REALPORT_GETCOUNTERS (('e'<<8) | 110) #define DIGI_REALPORT_GETEVENTS (('e'<<8) | 111) -#define EV_OPU 0x0001 /* !<Output paused by client */ -#define EV_OPS 0x0002 /* !<Output paused by reqular sw flowctrl */ -#define EV_IPU 0x0010 /* !<Input paused unconditionally by user */ -#define EV_IPS 0x0020 /* !<Input paused by high/low water marks */ -#define EV_TXB 0x0040 /* !<Transmit break pending */ +#define EV_OPU 0x0001 /* !<Output paused by client */ +#define EV_OPS 0x0002 /* !<Output paused by reqular sw flowctrl */ +#define EV_IPU 0x0010 /* !<Input paused unconditionally by user */ +#define EV_IPS 0x0020 /* !<Input paused by high/low water marks */ +#define EV_TXB 0x0040 /* !<Transmit break pending */ /* * This structure holds data needed for the intelligent <--> nonintelligent |