diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-17 18:12:36 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-17 18:12:36 -0500 |
| commit | 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch) | |
| tree | 72e500b97c4bdcb9631209f3121f42b05ae30fea /drivers/Kconfig | |
| parent | 40c0591f0a349ec074357e05c6ab1a3bc951807c (diff) | |
| parent | 19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff) | |
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index b5e6f243f749..5afe5d1f199b 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -116,6 +116,8 @@ source "drivers/vlynq/Kconfig" | |||
| 116 | 116 | ||
| 117 | source "drivers/virtio/Kconfig" | 117 | source "drivers/virtio/Kconfig" |
| 118 | 118 | ||
| 119 | source "drivers/hv/Kconfig" | ||
| 120 | |||
| 119 | source "drivers/xen/Kconfig" | 121 | source "drivers/xen/Kconfig" |
| 120 | 122 | ||
| 121 | source "drivers/staging/Kconfig" | 123 | source "drivers/staging/Kconfig" |
| @@ -132,8 +134,6 @@ source "drivers/iommu/Kconfig" | |||
| 132 | 134 | ||
| 133 | source "drivers/virt/Kconfig" | 135 | source "drivers/virt/Kconfig" |
| 134 | 136 | ||
| 135 | source "drivers/hv/Kconfig" | ||
| 136 | |||
| 137 | source "drivers/devfreq/Kconfig" | 137 | source "drivers/devfreq/Kconfig" |
| 138 | 138 | ||
| 139 | endmenu | 139 | endmenu |