diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:56:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-07 12:58:28 +0200 |
| commit | b395fb36d59e17b9335805c10fa30fc51c8a94c6 (patch) | |
| tree | b96bc8eee33753e2a1b1181c62a028d7f89643d7 /drivers/Kconfig | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff) | |
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
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 3bb154d8c8c..9d513188b47 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -126,4 +126,6 @@ source "drivers/hwspinlock/Kconfig" source "drivers/clocksource/Kconfig" +source "drivers/iommu/Kconfig" + endmenu |