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/ide/ide-disk_proc.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/ide/ide-disk_proc.c')
| -rw-r--r-- | drivers/ide/ide-disk_proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index 60b0590ccc9c..f9bbd904eae7 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/ide.h> | 2 | #include <linux/ide.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/seq_file.h> | 4 | #include <linux/seq_file.h> |
| 4 | 5 | ||
| 5 | #include "ide-disk.h" | 6 | #include "ide-disk.h" |