summaryrefslogtreecommitdiffstats
path: root/drivers/uio/uio_netx.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-05-08 23:59:58 +0200
committerH. Peter Anvin <hpa@zytor.com>2010-05-08 23:59:58 +0200
commitd7be0ce6afb1df60bc786f57410407ceae92b994 (patch)
tree5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/uio/uio_netx.c
parentx86: Clean up the hypervisor layer (diff)
parentLinux 2.6.34-rc6 (diff)
downloadlinux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz
linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/uio/uio_netx.c')
-rw-r--r--drivers/uio/uio_netx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c
index afbf0bd55cc9..5a18e9f7b836 100644
--- a/drivers/uio/uio_netx.c
+++ b/drivers/uio/uio_netx.c
@@ -13,6 +13,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/slab.h>
#include <linux/uio_driver.h>
#define PCI_VENDOR_ID_HILSCHER 0x15CF