diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 06:04:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 06:04:23 +0200 |
| commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch) | |
| tree | a196404c795091aae4254c9d479dce1c0653e4c5 /arch/cris | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | CRIS: ioctl for getting RS485 information (diff) | |
| download | linux-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.tar.xz linux-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.zip | |
Merge branch 'rs485fix' of git://www.jni.nu/cris
* 'rs485fix' of git://www.jni.nu/cris:
CRIS: ioctl for getting RS485 information
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/include/asm/ioctls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/ioctls.h b/arch/cris/include/asm/ioctls.h index 35bbc181598a..076c07824eb6 100644 --- a/arch/cris/include/asm/ioctls.h +++ b/arch/cris/include/asm/ioctls.h @@ -77,6 +77,7 @@ #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ #define TIOCSERWRRS485 0x5462 /* write rs-485 */ #define TIOCSRS485 0x5463 /* enable rs-485 */ +#define TIOCGRS485 0x542E /* get rs-485 */ /* Used for packet mode */ #define TIOCPKT_DATA 0 |