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 /arch/ia64/kernel/iosapic.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
| -rw-r--r-- | arch/ia64/kernel/iosapic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 95ac77aeae9b..7ded76658d2d 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
| 87 | #include <linux/list.h> | 87 | #include <linux/list.h> |
| 88 | #include <linux/pci.h> | 88 | #include <linux/pci.h> |
| 89 | #include <linux/slab.h> | ||
| 89 | #include <linux/smp.h> | 90 | #include <linux/smp.h> |
| 90 | #include <linux/string.h> | 91 | #include <linux/string.h> |
| 91 | #include <linux/bootmem.h> | 92 | #include <linux/bootmem.h> |