diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:22:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:22:31 +0200 |
| commit | 02a650e2820e19fde8f6a49752027217fdd33d78 (patch) | |
| tree | 92d97b79941c0cee9a1da1e8a21abc7a661aa0f5 /arch/avr32/include/asm/sockios.h | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Merge branch 'disintegrate-avr32' into disintegrate-misc-arches (diff) | |
| download | linux-02a650e2820e19fde8f6a49752027217fdd33d78.tar.xz linux-02a650e2820e19fde8f6a49752027217fdd33d78.zip | |
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for misc arches from David Howells:
"UAPI disintegration for MN10300, FRV and AVR32 arches"
* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
UAPI: (Scripted) Disintegrate arch/frv/include/asm
UAPI: (Scripted) Disintegrate arch/avr32/include/asm
Diffstat (limited to 'arch/avr32/include/asm/sockios.h')
| -rw-r--r-- | arch/avr32/include/asm/sockios.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/avr32/include/asm/sockios.h b/arch/avr32/include/asm/sockios.h deleted file mode 100644 index 0802d742f97d..000000000000 --- a/arch/avr32/include/asm/sockios.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __ASM_AVR32_SOCKIOS_H -#define __ASM_AVR32_SOCKIOS_H - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif /* __ASM_AVR32_SOCKIOS_H */ |