diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/uio/uio_aec.c | |
parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/uio/uio_aec.c')
-rw-r--r-- | drivers/uio/uio_aec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uio/uio_aec.c b/drivers/uio/uio_aec.c index b7830e9a3baa..72b22d44e8b9 100644 --- a/drivers/uio/uio_aec.c +++ b/drivers/uio/uio_aec.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
29 | #include <linux/uio_driver.h> | 29 | #include <linux/uio_driver.h> |
30 | #include <linux/slab.h> | ||
30 | 31 | ||
31 | #define PCI_VENDOR_ID_AEC 0xaecb | 32 | #define PCI_VENDOR_ID_AEC 0xaecb |
32 | #define PCI_DEVICE_ID_AEC_VITCLTC 0x6250 | 33 | #define PCI_DEVICE_ID_AEC_VITCLTC 0x6250 |