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_sercos3.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/uio/uio_sercos3.c')
| -rw-r--r-- | drivers/uio/uio_sercos3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c index a6d1b2bc47f3..3d461cd73e6b 100644 --- a/drivers/uio/uio_sercos3.c +++ b/drivers/uio/uio_sercos3.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/uio_driver.h> | 29 | #include <linux/uio_driver.h> |
| 30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | /* ID's for SERCOS III PCI card (PLX 9030) */ | 33 | /* ID's for SERCOS III PCI card (PLX 9030) */ |
| 33 | #define SERCOS_SUB_VENDOR_ID 0x1971 | 34 | #define SERCOS_SUB_VENDOR_ID 0x1971 |