diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /arch/powerpc/include/asm/ioctls.h | |
| parent | trace: clean up funny line breaks in stat_seq_show (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | linux-dev-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz linux-dev-99cd7074891f87c49660e3b2880564324a4733ac.zip | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'arch/powerpc/include/asm/ioctls.h')
| -rw-r--r-- | arch/powerpc/include/asm/ioctls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/ioctls.h b/arch/powerpc/include/asm/ioctls.h index 279a6229584b..1842186d872c 100644 --- a/arch/powerpc/include/asm/ioctls.h +++ b/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 */ |