diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/linux/spi | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/linux/spi')
| -rw-r--r-- | include/linux/spi/spidev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h index c93ef9d42a01..95251ccd5a07 100644 --- a/include/linux/spi/spidev.h +++ b/include/linux/spi/spidev.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #ifndef SPIDEV_H | 22 | #ifndef SPIDEV_H |
| 23 | #define SPIDEV_H | 23 | #define SPIDEV_H |
| 24 | 24 | ||
| 25 | #include <linux/types.h> | ||
| 25 | 26 | ||
| 26 | /* User space versions of kernel symbols for SPI clocking modes, | 27 | /* User space versions of kernel symbols for SPI clocking modes, |
| 27 | * matching <linux/spi/spi.h> | 28 | * matching <linux/spi/spi.h> |