kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'topic/for-asoc'

Browse source
This commit is contained in:
Samuel Ortiz 2013-09-02 10:31:08 +02:00
commit f4388ca7f1
4 changed files with 46 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/mfd/davinci_voicecodec.h
View file

@ -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];

1
include/linux/mfd/twl6040.h
View file

@ -230,7 +230,6 @@ struct twl6040 {
int audpwron;
int power_count;
int rev;
u8 vibra_ctrl_cache[2];
/* PLL configuration */
int pll;