diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-28 14:48:58 -0500 |
| commit | b3950d50cfc343b3e7dc5c69c96a61b182fd1e37 (patch) | |
| tree | d54affae2b1e25464493b48aa88cd8d6b4770812 /include/linux/mfd | |
| parent | daefd89efc279b142bbb054577c2d706da211723 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' into gpio/next
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/twl6040.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 2463c2619596..9bc9ac651dad 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h | |||
| @@ -187,8 +187,10 @@ struct twl6040 { | |||
| 187 | int rev; | 187 | int rev; |
| 188 | u8 vibra_ctrl_cache[2]; | 188 | u8 vibra_ctrl_cache[2]; |
| 189 | 189 | ||
| 190 | /* PLL configuration */ | ||
| 190 | int pll; | 191 | int pll; |
| 191 | unsigned int sysclk; | 192 | unsigned int sysclk; |
| 193 | unsigned int mclk; | ||
| 192 | 194 | ||
| 193 | unsigned int irq; | 195 | unsigned int irq; |
| 194 | unsigned int irq_base; | 196 | unsigned int irq_base; |
