diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/Kconfig | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
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" | |||
| 68 | 68 | ||
| 69 | source "drivers/mfd/Kconfig" | 69 | source "drivers/mfd/Kconfig" |
| 70 | 70 | ||
| 71 | source "drivers/regulator/Kconfig" | ||
| 72 | |||
| 71 | source "drivers/media/Kconfig" | 73 | source "drivers/media/Kconfig" |
| 72 | 74 | ||
| 73 | source "drivers/video/Kconfig" | 75 | source "drivers/video/Kconfig" |