diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:12 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:12 +0900 |
| commit | 05cf9dd84b91fab91ddf2398ae974516445295f0 (patch) | |
| tree | 1a269022425423f937946195e374875e0ebca9d7 /include | |
| parent | 897074d89b26f3f287b144689974672b8b86b805 (diff) | |
| parent | 1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d (diff) | |
| download | linux-05cf9dd84b91fab91ddf2398ae974516445295f0.tar.gz linux-05cf9dd84b91fab91ddf2398ae974516445295f0.tar.bz2 linux-05cf9dd84b91fab91ddf2398ae974516445295f0.zip | |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'include')
| -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 { #define QUIRK_NEED_RSTCLR (1 << 3) /* Quirks of the I2S controller */ u32 quirks; - - /* - * Array of clock names that can be used to generate I2S signals. - * Also corresponds to clocks of I2SMOD[10] - */ - const char **src_clk; dma_addr_t idma_addr; }; |