Merge branch 'rs485fix' of git://www.jni.nu/cris

* 'rs485fix' of git://www.jni.nu/cris:
  CRIS: ioctl for getting RS485 information
This commit is contained in:
Linus Torvalds 2010-08-09 21:04:23 -07:00
commit 7fbd15f9b4
2 changed files with 12 additions and 0 deletions

View file

@ -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