diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /include/asm-xtensa | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'include/asm-xtensa')
| -rw-r--r-- | include/asm-xtensa/ioctls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/ioctls.h b/include/asm-xtensa/ioctls.h index 10c443435c11..3b89a772d0a0 100644 --- a/include/asm-xtensa/ioctls.h +++ b/include/asm-xtensa/ioctls.h | |||
| @@ -107,6 +107,6 @@ | |||
| 107 | #define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* Set multiport config */ | 107 | #define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* Set multiport config */ |
| 108 | 108 | ||
| 109 | #define TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ | 109 | #define TIOCMIWAIT _IO('T', 92) /* wait for a change on serial input line(s) */ |
| 110 | #define TIOCGICOUNT _IOR('T', 93, struct async_icount) /* read serial port inline interrupt counts */ | 110 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ |
| 111 | 111 | ||
| 112 | #endif /* _XTENSA_IOCTLS_H */ | 112 | #endif /* _XTENSA_IOCTLS_H */ |