diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 12:35:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 12:35:33 +0100 |
| commit | 06be5eefe1192eb8ce8d07497f67595b6bfe9741 (patch) | |
| tree | 80f1987d4970f8079681f8be0c135cafc8d6329a /drivers/staging/dgnc/digi.h | |
| parent | ARM: fix lockdep unannotated irqs-off warning (diff) | |
| parent | ARM: avoid unwanted GCC memset()/memcpy() optimisations for IO variants (diff) | |
| download | linux-dev-06be5eefe1192eb8ce8d07497f67595b6bfe9741.tar.xz linux-dev-06be5eefe1192eb8ce8d07497f67595b6bfe9741.zip | |
Merge branches 'fixes' and 'ioremap' into for-linus
Diffstat (limited to 'drivers/staging/dgnc/digi.h')
| -rw-r--r-- | drivers/staging/dgnc/digi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h index d637a7802168..cf9dcae7cc3f 100644 --- a/drivers/staging/dgnc/digi.h +++ b/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 |