diff --git a/[refs] b/[refs] index 542e58e83fee..12f39775ebf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16124f10df43e6e08783f1fede6888bf36ac705c +refs/heads/master: d50701781a55d09696a0585112a124b0723acf3b diff --git a/trunk/arch/powerpc/include/asm/ioctls.h b/trunk/arch/powerpc/include/asm/ioctls.h index 279a6229584b..1842186d872c 100644 --- a/trunk/arch/powerpc/include/asm/ioctls.h +++ b/trunk/arch/powerpc/include/asm/ioctls.h @@ -89,6 +89,8 @@ #define TIOCSBRK 0x5427 /* BSD compatibility */ #define TIOCCBRK 0x5428 /* BSD compatibility */ #define TIOCGSID 0x5429 /* Return the session ID of FD */ +#define TIOCGRS485 0x542e +#define TIOCSRS485 0x542f #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */