summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-09-04 20:12:36 +0000
committerhselasky <hselasky@FreeBSD.org>2014-09-04 20:12:36 +0000
commitec8cd58eaa7dce1497f70cbccb426548688b297a (patch)
tree23b0dc5ba6b006f74b06a4bc47467cfeb326038f /sys/contrib
parent0475b83655c10a4792a79a97799741c84500ad44 (diff)
downloadFreeBSD-src-ec8cd58eaa7dce1497f70cbccb426548688b297a.zip
FreeBSD-src-ec8cd58eaa7dce1497f70cbccb426548688b297a.tar.gz
MFC r270710 and r270821:
- Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. - Remove empty files from the OFED Linux Emulation layer. - Fix compile warnings related to printf() and the "%lld" and "%llx" format specifiers. - Add some missing 2-clause BSD copyrights. - Add "Mellanox Technologies, Ltd." to list of copyright holders. - Add some new compatibility files. - Fix order of uninit in the mlx4ib module to avoid crash at unload using the new module_exit_order() function. Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/rdma/krping/krping.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/contrib/rdma/krping/krping.c b/sys/contrib/rdma/krping/krping.c
index 1aed101..733dd8a 100644
--- a/sys/contrib/rdma/krping/krping.c
+++ b/sys/contrib/rdma/krping/krping.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/string.h>
@@ -46,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <linux/device.h>
#include <linux/pci.h>
#include <linux/sched.h>
-#include <asm/system.h>
#include <asm/atomic.h>
OpenPOWER on IntegriCloud