diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 03:30:58 +0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 03:30:58 +0400 |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /arch/mips/pci/ops-titan-ht.c | |
parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/mips/pci/ops-titan-ht.c')
-rw-r--r-- | arch/mips/pci/ops-titan-ht.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-titan-ht.c b/arch/mips/pci/ops-titan-ht.c index 46c636c27e06..749c1922d420 100644 --- a/arch/mips/pci/ops-titan-ht.c +++ b/arch/mips/pci/ops-titan-ht.c @@ -26,7 +26,6 @@ #include <linux/types.h> #include <linux/pci.h> #include <linux/kernel.h> -#include <linux/slab.h> #include <linux/delay.h> #include <asm/io.h> |