diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 10:52:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 10:52:06 -0500 |
| commit | c8bf9fec478bb8d3c66067be2aaa4082b83da46c (patch) | |
| tree | 0fd9761ba12f5f58a3435e9b3bc5a285d552f0c4 /include/linux/mfd/mc13783.h | |
| parent | a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 (diff) | |
| parent | 1ad02bbce64e5226b0582af85df4e481e2f6b7b9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (27 commits)
Regulators: wm8400 - cleanup platform driver data handling
Regulators: wm8994 - clean up driver data after removal
Regulators: wm831x-xxx - clean up driver data after removal
Regulators: pcap-regulator - clean up driver data after removal
Regulators: max8660 - annotate probe and remove methods
Regulators: max1586 - annotate probe and remove methods
Regulators: lp3971 - fail if platform data was not supplied
Regulators: tps6507x-regulator - mark probe method as __devinit
Regulators: tps65023-regulator - mark probe method as __devinit
Regulators: twl-regulator - mark probe function as __devinit
Regulators: fixed - annotate probe and remove methods
Regulators: ab3100 - fix probe and remove annotations
Regulators: virtual - use sysfs attribute groups
twl6030: regulator: Configure STATE register instead of REMAP
regulator: Provide optional dummy regulator for consumers
regulator: Assume regulators are enabled if they don't report anything
regulator: Convert fixed voltage regulator to use enable_time()
regulator: Add WM8994 regulator support
regulator: enable max8649 regulator driver
regulator: trivial: fix typos in user-visible Kconfig text
...
Diffstat (limited to 'include/linux/mfd/mc13783.h')
| -rw-r--r-- | include/linux/mfd/mc13783.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/mc13783.h b/include/linux/mfd/mc13783.h index 35680409b8cf..94cb51a64037 100644 --- a/include/linux/mfd/mc13783.h +++ b/include/linux/mfd/mc13783.h | |||
| @@ -108,6 +108,8 @@ int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode, | |||
| 108 | #define MC13783_REGU_V2 28 | 108 | #define MC13783_REGU_V2 28 |
| 109 | #define MC13783_REGU_V3 29 | 109 | #define MC13783_REGU_V3 29 |
| 110 | #define MC13783_REGU_V4 30 | 110 | #define MC13783_REGU_V4 30 |
| 111 | #define MC13783_REGU_PWGT1SPI 31 | ||
| 112 | #define MC13783_REGU_PWGT2SPI 32 | ||
| 111 | 113 | ||
| 112 | #define MC13783_IRQ_ADCDONE 0 | 114 | #define MC13783_IRQ_ADCDONE 0 |
| 113 | #define MC13783_IRQ_ADCBISDONE 1 | 115 | #define MC13783_IRQ_ADCBISDONE 1 |