diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /arch/arm/plat-orion/include/plat/audio.h | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'arch/arm/plat-orion/include/plat/audio.h')
| -rw-r--r-- | arch/arm/plat-orion/include/plat/audio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h index 9cf1f781329b..885f8abd927b 100644 --- a/arch/arm/plat-orion/include/plat/audio.h +++ b/arch/arm/plat-orion/include/plat/audio.h | |||
| @@ -1,11 +1,8 @@ | |||
| 1 | #ifndef __PLAT_AUDIO_H | 1 | #ifndef __PLAT_AUDIO_H |
| 2 | #define __PLAT_AUDIO_H | 2 | #define __PLAT_AUDIO_H |
| 3 | 3 | ||
| 4 | #include <linux/mbus.h> | ||
| 5 | |||
| 6 | struct kirkwood_asoc_platform_data { | 4 | struct kirkwood_asoc_platform_data { |
| 7 | u32 tclk; | 5 | u32 tclk; |
| 8 | struct mbus_dram_target_info *dram; | ||
| 9 | int burst; | 6 | int burst; |
| 10 | }; | 7 | }; |
| 11 | #endif | 8 | #endif |