diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-09-02 08:31:08 (GMT) |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-09-02 08:31:08 (GMT) |
| commit | f4388ca7f1e7c19a406700b3d1d3bfbf15d14115 (patch) | |
| tree | 1edb8323d6cfe88620ac0c3f3c0f6c8e61134c7d /include/linux/mfd | |
| parent | 62282180645a94f8686680bca464afd418511510 (diff) | |
| parent | c6f39257c952bc7da974bf93255936ff2ece2c34 (diff) | |
| download | linux-fsl-qoriq-f4388ca7f1e7c19a406700b3d1d3bfbf15d14115.tar.xz | |
Merge branch 'topic/for-asoc'
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/davinci_voicecodec.h | 3 | ||||
| -rw-r--r-- | include/linux/mfd/twl6040.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index 13a1ee9..5166935 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h @@ -30,6 +30,8 @@ #include <mach/hardware.h> +struct regmap; + /* * Register values. */ @@ -113,6 +115,7 @@ struct davinci_vc { /* Memory resources */ void __iomem *base; + struct regmap *regmap; /* MFD cells */ struct mfd_cell cells[DAVINCI_VC_CELLS]; diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 6dd8893..81f639b 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -230,7 +230,6 @@ struct twl6040 { int audpwron; int power_count; int rev; - u8 vibra_ctrl_cache[2]; /* PLL configuration */ int pll; |