diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
| commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
| tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /include/linux/mfd/tps65912.h | |
| parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
| parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) | |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'include/linux/mfd/tps65912.h')
| -rw-r--r-- | include/linux/mfd/tps65912.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h index aaceab402ec5..6d309032dc0d 100644 --- a/include/linux/mfd/tps65912.h +++ b/include/linux/mfd/tps65912.h | |||
| @@ -323,5 +323,6 @@ int tps65912_device_init(struct tps65912 *tps65912); | |||
| 323 | void tps65912_device_exit(struct tps65912 *tps65912); | 323 | void tps65912_device_exit(struct tps65912 *tps65912); |
| 324 | int tps65912_irq_init(struct tps65912 *tps65912, int irq, | 324 | int tps65912_irq_init(struct tps65912 *tps65912, int irq, |
| 325 | struct tps65912_platform_data *pdata); | 325 | struct tps65912_platform_data *pdata); |
| 326 | int tps65912_irq_exit(struct tps65912 *tps65912); | ||
| 326 | 327 | ||
| 327 | #endif /* __LINUX_MFD_TPS65912_H */ | 328 | #endif /* __LINUX_MFD_TPS65912_H */ |