diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:31 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:31 +0800 |
commit | 1aba37fc5314da4ea3c3eb759b9e4c52c4404136 (patch) | |
tree | 2648401ad8afc092a9cefe42f8a8e5d12cb914c5 /drivers/Kconfig | |
parent | 5347127d7d2ccffdd5dc6af8a24010199ef86f46 (diff) | |
parent | 7ab5ecfab5802502955e1a9789eeb8e2fc3a985f (diff) |
Merge topic branch 'security' into integration-linux-ux500
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 d236aef7e59..68e36aed05b 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" @@ -141,3 +143,4 @@ source "drivers/virt/Kconfig" source "drivers/devfreq/Kconfig" endmenu + |