diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
| commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch) | |
| tree | a196404c795091aae4254c9d479dce1c0653e4c5 /arch/cris | |
| parent | 1989425a3aed215f1accd5d8019b18b345166a63 (diff) | |
| parent | f1d23ed8218ca5afaf178a6495253dbb7fc98f57 (diff) | |
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 @@ | |||
| 77 | #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ | 77 | #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ |
| 78 | #define TIOCSERWRRS485 0x5462 /* write rs-485 */ | 78 | #define TIOCSERWRRS485 0x5462 /* write rs-485 */ |
| 79 | #define TIOCSRS485 0x5463 /* enable rs-485 */ | 79 | #define TIOCSRS485 0x5463 /* enable rs-485 */ |
| 80 | #define TIOCGRS485 0x542E /* get rs-485 */ | ||
| 80 | 81 | ||
| 81 | /* Used for packet mode */ | 82 | /* Used for packet mode */ |
| 82 | #define TIOCPKT_DATA 0 | 83 | #define TIOCPKT_DATA 0 |