diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/asm-xtensa/sockios.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-xtensa/sockios.h')
| -rw-r--r-- | include/asm-xtensa/sockios.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-xtensa/sockios.h b/include/asm-xtensa/sockios.h index 20d2ba10ecd1..efe0af379f01 100644 --- a/include/asm-xtensa/sockios.h +++ b/include/asm-xtensa/sockios.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #define SIOCSPGRP _IOW('s', 8, pid_t) | 25 | #define SIOCSPGRP _IOW('s', 8, pid_t) |
| 26 | #define SIOCGPGRP _IOR('s', 9, pid_t) | 26 | #define SIOCGPGRP _IOR('s', 9, pid_t) |
| 27 | 27 | ||
| 28 | #define SIOCGSTAMP 0x8906 /* Get stamp - linux-specific */ | 28 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 29 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 29 | 30 | ||
| 30 | #endif /* _XTENSA_SOCKIOS_H */ | 31 | #endif /* _XTENSA_SOCKIOS_H */ |