diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /arch/powerpc/include/asm/termbits.h | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'arch/powerpc/include/asm/termbits.h')
| -rw-r--r-- | arch/powerpc/include/asm/termbits.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/termbits.h b/arch/powerpc/include/asm/termbits.h index 6698188ca550..549d700e18f2 100644 --- a/arch/powerpc/include/asm/termbits.h +++ b/arch/powerpc/include/asm/termbits.h | |||
| @@ -189,6 +189,7 @@ struct ktermios { | |||
| 189 | #define FLUSHO 0x00800000 | 189 | #define FLUSHO 0x00800000 |
| 190 | #define PENDIN 0x20000000 | 190 | #define PENDIN 0x20000000 |
| 191 | #define IEXTEN 0x00000400 | 191 | #define IEXTEN 0x00000400 |
| 192 | #define EXTPROC 0x10000000 | ||
| 192 | 193 | ||
| 193 | /* Values for the ACTION argument to `tcflow'. */ | 194 | /* Values for the ACTION argument to `tcflow'. */ |
| 194 | #define TCOOFF 0 | 195 | #define TCOOFF 0 |