diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /include/asm-alpha/sockios.h | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-alpha/sockios.h')
| -rw-r--r-- | include/asm-alpha/sockios.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-alpha/sockios.h b/include/asm-alpha/sockios.h index e4961a740e5f..7932c7ab4a4d 100644 --- a/include/asm-alpha/sockios.h +++ b/include/asm-alpha/sockios.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define SIOCSPGRP _IOW('s', 8, pid_t) | 10 | #define SIOCSPGRP _IOW('s', 8, pid_t) |
| 11 | #define SIOCGPGRP _IOR('s', 9, pid_t) | 11 | #define SIOCGPGRP _IOR('s', 9, pid_t) |
| 12 | 12 | ||
| 13 | #define SIOCGSTAMP 0x8906 /* Get stamp - linux-specific */ | 13 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 14 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 14 | 15 | ||
| 15 | #endif /* _ASM_ALPHA_SOCKIOS_H */ | 16 | #endif /* _ASM_ALPHA_SOCKIOS_H */ |