diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 13:56:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 13:56:40 -0400 |
| commit | 561b35b341b1aeeab486affe1ede0ee6640ce33b (patch) | |
| tree | a7570737884bef3c15db98cae629a82ce3586b3c /arch | |
| parent | a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287 (diff) | |
| parent | 0eb5d5ab3ec99bfd22ff16797d95835369ffb25b (diff) | |
Merge branch 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: TI bq24022 Li-Ion Charger driver
regulator: maintainers - add maintainers for regulator framework.
regulator: documentation - ABI
regulator: documentation - machine
regulator: documentation - regulator driver
regulator: documentation - consumer interface
regulator: documentation - overview
regulator: core kbuild files
regulator: regulator test harness
regulator: add support for fixed regulators.
regulator: regulator framework core
regulator: fixed regulator interface
regulator: machine driver interface
regulator: regulator driver interface
regulator: consumer device interface
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 257033c691f2..4b8acd2851f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1225,6 +1225,8 @@ source "drivers/dma/Kconfig" | |||
| 1225 | 1225 | ||
| 1226 | source "drivers/dca/Kconfig" | 1226 | source "drivers/dca/Kconfig" |
| 1227 | 1227 | ||
| 1228 | source "drivers/regulator/Kconfig" | ||
| 1229 | |||
| 1228 | source "drivers/uio/Kconfig" | 1230 | source "drivers/uio/Kconfig" |
| 1229 | 1231 | ||
| 1230 | endmenu | 1232 | endmenu |