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-arm/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-arm/sockios.h')
| -rw-r--r-- | include/asm-arm/sockios.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/sockios.h b/include/asm-arm/sockios.h index 77c34087d513..a2588a2512df 100644 --- a/include/asm-arm/sockios.h +++ b/include/asm-arm/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 | 13 | #endif |