diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2010-08-20 17:14:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 10:19:59 -0700 |
| commit | 8bc3372d9e57db3c65cf00cea6cf14969875b055 (patch) | |
| tree | 052719305c47ba98417b4b5fbd1ab4e563d91fcb /include/asm-generic | |
| parent | 94da7d6f1ff3793669946146d9b6ab9c608b938e (diff) | |
| download | linux-8bc3372d9e57db3c65cf00cea6cf14969875b055.tar.gz linux-8bc3372d9e57db3c65cf00cea6cf14969875b055.tar.bz2 linux-8bc3372d9e57db3c65cf00cea6cf14969875b055.zip | |
ioctl: Use asm-generic/ioctls.h on cris (enables termiox)
This patch converts cris to use asm-generic/ioctls.h instead of its
own version.
The differences between the arch-specific version and the generic
version are as follows:
- CRIS defines two ioctls: TIOCSERSETRS485 and TIOCSERWRRS485,
kept in arch-specific portion
- CRIS defines a different value for TIOCSRS485, kept via ifndef in generic
- The generic version adds support for termiox
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/ioctls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h index 8554cb6a81b9..a3216655d657 100644 --- a/include/asm-generic/ioctls.h +++ b/include/asm-generic/ioctls.h @@ -62,7 +62,9 @@ #define TCSETSW2 _IOW('T', 0x2C, struct termios2) #define TCSETSF2 _IOW('T', 0x2D, struct termios2) #define TIOCGRS485 0x542E +#ifndef TIOCSRS485 #define TIOCSRS485 0x542F +#endif #define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */ #define TCGETX 0x5432 /* SYS5 TCGETX compatibility */ |