diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 15:17:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-13 15:17:45 -0400 |
| commit | cf7d8a5550779486524f775c8cf4be9b91365d23 (patch) | |
| tree | 0be1d7e7aebcedcd97e1ec9a1af3a190f45a20b4 /include | |
| parent | 4166fb64593514ad920b7dbd290e0a934b37d24a (diff) | |
| parent | 39ec0d38141b198f94fd19c2bb10fd7c616510d2 (diff) | |
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull SPI bug fixes from Grant Likely:
"Miscellaneous driver bug fixes. No major changes in this branch."
* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
spi/imx: prevent NULL pointer dereference in spi_imx_probe()
spi/imx: mark base member in spi_imx_data as __iomem
spi/mpc83xx: fix NULL pdata dereference bug
spi/davinci: Fix DMA API usage in davinci
spi/pL022: include types.h to remove compilation warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/pl022.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/amba/pl022.h b/include/linux/amba/pl022.h index b8c51124ed19..76dd1b199a1b 100644 --- a/include/linux/amba/pl022.h +++ b/include/linux/amba/pl022.h | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | #ifndef _SSP_PL022_H | 25 | #ifndef _SSP_PL022_H |
| 26 | #define _SSP_PL022_H | 26 | #define _SSP_PL022_H |
| 27 | 27 | ||
| 28 | #include <linux/types.h> | ||
| 29 | |||
| 28 | /** | 30 | /** |
| 29 | * whether SSP is in loopback mode or not | 31 | * whether SSP is in loopback mode or not |
| 30 | */ | 32 | */ |