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/scsi/eata.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/scsi/eata.c')
| -rw-r--r-- | drivers/scsi/eata.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 3c5abf7cd762..d1c31378f6da 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c | |||
| @@ -490,6 +490,7 @@ | |||
| 490 | #include <linux/ctype.h> | 490 | #include <linux/ctype.h> |
| 491 | #include <linux/spinlock.h> | 491 | #include <linux/spinlock.h> |
| 492 | #include <linux/dma-mapping.h> | 492 | #include <linux/dma-mapping.h> |
| 493 | #include <linux/slab.h> | ||
| 493 | #include <asm/byteorder.h> | 494 | #include <asm/byteorder.h> |
| 494 | #include <asm/dma.h> | 495 | #include <asm/dma.h> |
| 495 | #include <asm/io.h> | 496 | #include <asm/io.h> |