diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 01:30:58 +0200 |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/ssb/pci.c | |
parent | DMAENGINE: extend the control command to include an arg (diff) | |
parent | async_tx: trim dma_async_tx_descriptor in 'no channel switch' case (diff) | |
download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.zip |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/ssb/pci.c')
-rw-r--r-- | drivers/ssb/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 9e50896233aa..a8dbb06623c9 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c @@ -17,6 +17,7 @@ #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_regs.h> +#include <linux/slab.h> #include <linux/pci.h> #include <linux/delay.h> |