diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 09:27:08 -0500 |
| commit | bb799d3b980eb803ca2da4a4eefbd9308f8d988a (patch) | |
| tree | 69fbe0cd6d47b23a50f5e1d87bf7489532fae149 /arch/avr32/include/uapi/asm/socket.h | |
| parent | 919fc6e34831d1c2b58bfb5ae261dc3facc9b269 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into core/locking
Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/avr32/include/uapi/asm/socket.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/include/uapi/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h index 439936421434..cbf902e4cd9e 100644 --- a/arch/avr32/include/uapi/asm/socket.h +++ b/arch/avr32/include/uapi/asm/socket.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __ASM_AVR32_SOCKET_H | 1 | #ifndef _UAPI__ASM_AVR32_SOCKET_H |
| 2 | #define __ASM_AVR32_SOCKET_H | 2 | #define _UAPI__ASM_AVR32_SOCKET_H |
| 3 | 3 | ||
| 4 | #include <asm/sockios.h> | 4 | #include <asm/sockios.h> |
| 5 | 5 | ||
| @@ -78,4 +78,4 @@ | |||
| 78 | 78 | ||
| 79 | #define SO_MAX_PACING_RATE 47 | 79 | #define SO_MAX_PACING_RATE 47 |
| 80 | 80 | ||
| 81 | #endif /* __ASM_AVR32_SOCKET_H */ | 81 | #endif /* _UAPI__ASM_AVR32_SOCKET_H */ |