diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:02 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:02 -0500 |
| commit | 93ac820df58de3b16e82fc3b9ff7437e66b2977d (patch) | |
| tree | 96cf756de8d66b025216431f4f28b4a25fccd5f1 /include | |
| parent | daa5ab9e0d20ab5c07a5f016fa0577ad66da546e (diff) | |
| parent | 3951e4aae2ce7e4593e575e91cbb22f1ba153596 (diff) | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/atmel-ssc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h index 4eb31752e2b7..deb0ae58b99b 100644 --- a/include/linux/atmel-ssc.h +++ b/include/linux/atmel-ssc.h | |||
| @@ -5,10 +5,16 @@ | |||
| 5 | #include <linux/list.h> | 5 | #include <linux/list.h> |
| 6 | #include <linux/io.h> | 6 | #include <linux/io.h> |
| 7 | 7 | ||
| 8 | struct atmel_ssc_platform_data { | ||
| 9 | int use_dma; | ||
| 10 | }; | ||
| 11 | |||
| 8 | struct ssc_device { | 12 | struct ssc_device { |
| 9 | struct list_head list; | 13 | struct list_head list; |
| 14 | resource_size_t phybase; | ||
| 10 | void __iomem *regs; | 15 | void __iomem *regs; |
| 11 | struct platform_device *pdev; | 16 | struct platform_device *pdev; |
| 17 | struct atmel_ssc_platform_data *pdata; | ||
| 12 | struct clk *clk; | 18 | struct clk *clk; |
| 13 | int user; | 19 | int user; |
| 14 | int irq; | 20 | int irq; |
