summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/automake.mk3
-rw-r--r--include/linux/types.h13
-rw-r--r--include/openvswitch/datapath-protocol.h6
3 files changed, 1 insertions, 21 deletions
diff --git a/include/linux/automake.mk b/include/linux/automake.mk
index 56103a795..a0a963d09 100644
--- a/include/linux/automake.mk
+++ b/include/linux/automake.mk
@@ -1,3 +1,2 @@
noinst_HEADERS += \
- include/linux/if_link.h \
- include/linux/types.h
+ include/linux/if_link.h
diff --git a/include/linux/types.h b/include/linux/types.h
deleted file mode 100644
index 8b9227e7d..000000000
--- a/include/linux/types.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_TYPES_USER_WRAPPER_H
-#define __LINUX_TYPES_USER_WRAPPER_H 1
-
-#include_next <linux/types.h>
-
-/* These were only introduced in v2.6.36. */
-#ifndef __aligned_u64
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif
-
-#endif
diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index eafc80032..dbf1f5e63 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -61,12 +61,6 @@
#include <sys/socket.h>
#endif
-#ifndef __aligned_u64
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif
-
#include <linux/if_link.h>
#include <linux/netlink.h>