diff options
author | Deepa Dinamani <deepa.kernel@gmail.com> | 2019-02-02 18:34:45 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-03 22:17:30 +0300 |
commit | 2edfd8e06145da646cb4ec3e6ed2a68dc8b746bb (patch) | |
tree | 7badbda009f1f2804ee2d3a30197ff53fa43eaad /arch/x86/include/uapi/asm | |
parent | fe0c72f3db11be752e7c06efad9fa27af1327c47 (diff) | |
download | linux-2edfd8e06145da646cb4ec3e6ed2a68dc8b746bb.tar.xz |
arch: Use asm-generic/socket.h when possible
Many architectures maintain an arch specific copy of the
file even though there are no differences with the asm-generic
one. Allow these architectures to use the generic one instead.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Cc: chris@zankel.net
Cc: fenghua.yu@intel.com
Cc: tglx@linutronix.de
Cc: schwidefsky@de.ibm.com
Cc: linux-ia64@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-s390@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/include/uapi/asm')
-rw-r--r-- | arch/x86/include/uapi/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/x86/include/uapi/asm/socket.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index f6648e9928b3..efe701b7c6ce 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm generated-y += unistd_32.h generated-y += unistd_64.h generated-y += unistd_x32.h +generic-y += socket.h diff --git a/arch/x86/include/uapi/asm/socket.h b/arch/x86/include/uapi/asm/socket.h deleted file mode 100644 index 6b71384b9d8b..000000000000 --- a/arch/x86/include/uapi/asm/socket.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/socket.h> |