git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi-5.1' into spi-5.2
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
include
/
uapi
/
asm
/
socket.h
diff --git
a/arch/alpha/include/uapi/asm/socket.h
b/arch/alpha/include/uapi/asm/socket.h
index 0d0fddb7e738841f8f01a8ca507cc5f38843ccad..976e89b116e5b5747d1e282b748befefd3634cdf 100644
(file)
--- a/
arch/alpha/include/uapi/asm/socket.h
+++ b/
arch/alpha/include/uapi/asm/socket.h
@@
-2,8
+2,8
@@
#ifndef _UAPI_ASM_SOCKET_H
#define _UAPI_ASM_SOCKET_H
+#include <linux/posix_types.h>
#include <asm/sockios.h>
-#include <asm/bitsperlong.h>
/* For setsockopt(2) */
/*