diff options
author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:42:49 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:42:49 +0100 |
commit | fd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch) | |
tree | 84d8c5596df7f6eb295ac380b8ddb983af6c906d /net/netlink/af_netlink.h | |
parent | Merge branch 'iommu/next' of git://linuxtv.org/pinchartl/fbdev into arm/renesas (diff) | |
parent | Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff) | |
download | linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.tar.xz linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.zip |
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'net/netlink/af_netlink.h')
-rw-r--r-- | net/netlink/af_netlink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.h b/net/netlink/af_netlink.h index f123a88496f8..f1c31b39aa3e 100644 --- a/net/netlink/af_netlink.h +++ b/net/netlink/af_netlink.h @@ -2,6 +2,7 @@ #define _AF_NETLINK_H #include <linux/rhashtable.h> +#include <linux/atomic.h> #include <net/sock.h> #define NLGRPSZ(x) (ALIGN(x, sizeof(unsigned long) * 8) / 8) |