diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 14:25:29 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 14:25:29 -0400 |
| commit | 5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch) | |
| tree | c0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /include/linux/mfd/arizona/core.h | |
| parent | 423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff) | |
| parent | d486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff) | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'include/linux/mfd/arizona/core.h')
| -rw-r--r-- | include/linux/mfd/arizona/core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index a710255528d7..cc281368dc55 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h | |||
| @@ -100,6 +100,9 @@ struct arizona { | |||
| 100 | struct regmap_irq_chip_data *aod_irq_chip; | 100 | struct regmap_irq_chip_data *aod_irq_chip; |
| 101 | struct regmap_irq_chip_data *irq_chip; | 101 | struct regmap_irq_chip_data *irq_chip; |
| 102 | 102 | ||
| 103 | bool hpdet_magic; | ||
| 104 | unsigned int hp_ena; | ||
| 105 | |||
| 103 | struct mutex clk_lock; | 106 | struct mutex clk_lock; |
| 104 | int clk32k_ref; | 107 | int clk32k_ref; |
| 105 | 108 | ||