diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-ia64/sockios.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-ia64/sockios.h')
| -rw-r--r-- | include/asm-ia64/sockios.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sockios.h b/include/asm-ia64/sockios.h index cf94857c8a54..15c92468ad38 100644 --- a/include/asm-ia64/sockios.h +++ b/include/asm-ia64/sockios.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #define FIOGETOWN 0x8903 | 14 | #define FIOGETOWN 0x8903 |
| 15 | #define SIOCGPGRP 0x8904 | 15 | #define SIOCGPGRP 0x8904 |
| 16 | #define SIOCATMARK 0x8905 | 16 | #define SIOCATMARK 0x8905 |
| 17 | #define SIOCGSTAMP 0x8906 /* Get stamp */ | 17 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 18 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 18 | 19 | ||
| 19 | #endif /* _ASM_IA64_SOCKIOS_H */ | 20 | #endif /* _ASM_IA64_SOCKIOS_H */ |