diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 13:35:37 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 13:35:37 -0400 |
| commit | 7b96c686223a5c902d6a59c7d178f3904f0ab757 (patch) | |
| tree | fe328ed56ad3719de3cfebad72ef74e34f1ed92b /include/linux/amba/pl022.h | |
| parent | f141ed65f256ec036c7fba604da6b7c448096ef9 (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
Merge tag 'v3.4-rc6' into gpio/next
Linux 3.4-rc6
Diffstat (limited to 'include/linux/amba/pl022.h')
| -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 | */ |