summaryrefslogtreecommitdiff
path: root/drivers/infiniband/core/mad_rmpp.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-03-30 17:22:22 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-03-30 17:26:41 +1100
commitef9ea503472da2992fcde8954ec3445d450d2781 (patch)
treed2ed39ac34f23090ae7cd8819bfc82d238d62d17 /drivers/infiniband/core/mad_rmpp.c
parentfb260b23c0a9225c93e8892280c6d73797a3cecc (diff)
parent8b2fe80f5a68b2ebcb0d83f09b94e0890fd8e0b5 (diff)
Merge remote branch 'slabh/slabh'
Conflicts: drivers/char/sysrq.c drivers/gpu/drm/radeon/r300.c drivers/hid/hid-wacom.c drivers/media/video/soc_camera.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c drivers/pcmcia/pcmcia_resource.c drivers/s390/char/vmcp.c drivers/staging/cx25821/cx25821-audio-upstream.c fs/9p/vfs_super.c include/linux/percpu.h kernel/audit_watch.c net/mac80211/scan.c sound/soc/codecs/ad1938.c
Diffstat (limited to 'drivers/infiniband/core/mad_rmpp.c')
-rw-r--r--drivers/infiniband/core/mad_rmpp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 4e0f2829e0e5..f37878c9c06e 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -31,6 +31,8 @@
* SOFTWARE.
*/
+#include <linux/slab.h>
+
#include "mad_priv.h"
#include "mad_rmpp.h"