diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/blackfin/include/asm/sockios.h | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'arch/blackfin/include/asm/sockios.h')
| -rw-r--r-- | arch/blackfin/include/asm/sockios.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/sockios.h b/arch/blackfin/include/asm/sockios.h new file mode 100644 index 000000000000..426b89bfaa8b --- /dev/null +++ b/arch/blackfin/include/asm/sockios.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifndef __ARCH_BFIN_SOCKIOS__ | ||
| 2 | #define __ARCH_BFIN_SOCKIOS__ | ||
| 3 | |||
| 4 | /* Socket-level I/O control calls. */ | ||
| 5 | #define FIOSETOWN 0x8901 | ||
| 6 | #define SIOCSPGRP 0x8902 | ||
| 7 | #define FIOGETOWN 0x8903 | ||
| 8 | #define SIOCGPGRP 0x8904 | ||
| 9 | #define SIOCATMARK 0x8905 | ||
| 10 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ | ||
| 11 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 12 | |||
| 13 | #endif /* __ARCH_BFIN_SOCKIOS__ */ | ||