diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-19 11:57:38 +0200 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-19 11:57:38 +0200 |
commit | 031d3076675708aab4c5c189f39d6cd74abd80cf (patch) | |
tree | 50ad6c29c2a39026883c16fa4e5e7aaf5440428f /include | |
parent | 8eb12b98163deaafae82e7dde044709919e4fdfa (diff) | |
parent | 3f9850f26241f1d4f9ed49eaa70e043a3bb24a7c (diff) | |
download | linux-031d3076675708aab4c5c189f39d6cd74abd80cf.tar.gz linux-031d3076675708aab4c5c189f39d6cd74abd80cf.tar.bz2 linux-031d3076675708aab4c5c189f39d6cd74abd80cf.zip |
Merge branch 'for-mfd-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/davinci_voicecodec.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index 0ab61320ffa8..94c53d4819c7 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h @@ -112,8 +112,6 @@ struct davinci_vc { /* Memory resources */ void __iomem *base; - resource_size_t pbase; - size_t base_size; /* MFD cells */ struct mfd_cell cells[DAVINCI_VC_CELLS]; |