diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:27 +0200 |
| commit | 79650543698457406d093c534ae17da2e48f6cd0 (patch) | |
| tree | 3c349e888d8a9eee1a465ca5423bc3e906425664 /drivers/Kconfig | |
| parent | 405c2b7ff83932a0272020dc4d653ac9affc8e56 (diff) | |
| parent | 6ca47269595b632879afbf22b057681592167611 (diff) | |
Merge topic branch 'security' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5afe5d1f199..cecb6b3c2cc 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -126,6 +126,8 @@ source "drivers/platform/Kconfig" source "drivers/clk/Kconfig" +source "drivers/tee/Kconfig" + source "drivers/hwspinlock/Kconfig" source "drivers/clocksource/Kconfig" @@ -137,3 +139,4 @@ source "drivers/virt/Kconfig" source "drivers/devfreq/Kconfig" endmenu + |