diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /drivers/Kconfig | |
parent | 6795a524f0b049ceb5417d5036ab5e233345b900 (diff) | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r-- | drivers/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index d236aef7e59..bfc918633fd 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -140,4 +140,12 @@ source "drivers/virt/Kconfig" source "drivers/devfreq/Kconfig" +source "drivers/extcon/Kconfig" + +source "drivers/memory/Kconfig" + +source "drivers/iio/Kconfig" + +source "drivers/vme/Kconfig" + endmenu |