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/spi/mpc52xx_spi.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/spi/mpc52xx_spi.c')
| -rw-r--r-- | drivers/spi/mpc52xx_spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index 6eab46537a0a..cd68f1ce5cc3 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/of_spi.h> | 21 | #include <linux/of_spi.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/of_gpio.h> | 23 | #include <linux/of_gpio.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/time.h> | 25 | #include <asm/time.h> |
| 25 | #include <asm/mpc52xx.h> | 26 | #include <asm/mpc52xx.h> |
| 26 | 27 | ||