diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:47:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 11:47:21 -0700 |
| commit | 908c3d8c005f19f807c67105cede0bd2c352a8e6 (patch) | |
| tree | 9015970d0fac30e8b03530322b9f8344d281b9fc /drivers/Kconfig | |
| parent | 3a7029d822d3aef4502269dae5fe8fbb83672bc5 (diff) | |
| parent | 1841c0f2bf6835aa3d18216e3a932371efa902f0 (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:
regulator: da903x regulator bug fix
regulator: Build on non-ARM platforms
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index d38f43f593d4..2f557f570ade 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -68,6 +68,8 @@ source "drivers/ssb/Kconfig" source "drivers/mfd/Kconfig" +source "drivers/regulator/Kconfig" + source "drivers/media/Kconfig" source "drivers/video/Kconfig" |