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-v850/sockios.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-v850/sockios.h')
| -rw-r--r-- | include/asm-v850/sockios.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-v850/sockios.h b/include/asm-v850/sockios.h index cf4874c2fd8a..823e106e6cd0 100644 --- a/include/asm-v850/sockios.h +++ b/include/asm-v850/sockios.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #define FIOGETOWN 0x8903 | 7 | #define FIOGETOWN 0x8903 |
| 8 | #define SIOCGPGRP 0x8904 | 8 | #define SIOCGPGRP 0x8904 |
| 9 | #define SIOCATMARK 0x8905 | 9 | #define SIOCATMARK 0x8905 |
| 10 | #define SIOCGSTAMP 0x8906 /* Get stamp */ | 10 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 11 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 11 | 12 | ||
| 12 | #endif /* __V850_SOCKIOS_H__ */ | 13 | #endif /* __V850_SOCKIOS_H__ */ |