diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:17 -0500 |
| commit | ceb8ef5e6dd55ddcfd875262f83c824f01f02181 (patch) | |
| tree | bb2a860519449e5a8b28eefb3f52dbfbbda3529a /include/linux/platform_data | |
| parent | a50345152e9f66e3bc7847c58980b55f5ff7bec4 (diff) | |
| parent | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (diff) | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/asoc-s3c.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index aa9875f77c40..88272591a895 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h | |||
| @@ -38,12 +38,6 @@ struct samsung_i2s { | |||
| 38 | #define QUIRK_NEED_RSTCLR (1 << 3) | 38 | #define QUIRK_NEED_RSTCLR (1 << 3) |
| 39 | /* Quirks of the I2S controller */ | 39 | /* Quirks of the I2S controller */ |
| 40 | u32 quirks; | 40 | u32 quirks; |
| 41 | |||
| 42 | /* | ||
| 43 | * Array of clock names that can be used to generate I2S signals. | ||
| 44 | * Also corresponds to clocks of I2SMOD[10] | ||
| 45 | */ | ||
| 46 | const char **src_clk; | ||
| 47 | dma_addr_t idma_addr; | 41 | dma_addr_t idma_addr; |
| 48 | }; | 42 | }; |
| 49 | 43 | ||
