diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index dfda8d773de..6b01a5afd62 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -4775,6 +4775,7 @@ config SWITCH_DUAL_MODEM
 
 config TIMA_RKP
        bool "Enable RKP (Realtime Kernel Protection) TIMA feature"
+       depends on TIMA
        default n
 
 config TIMA_RKP_30
@@ -4845,6 +4846,7 @@ config TIMA
 
 config TIMA_LKMAUTH
        bool "Enable LKM authentication TIMA feature"
+       depends on TIMA && MODULES
        default n
        help
          TIMA authenticates loaded kernel modules. Disable it if you don't
@@ -4860,6 +4862,7 @@ config TIMA_LKMAUTH_CODE_PROT
 
 config TIMA_TEST_INFRA
        tristate "Testing infrastructure for TIMA"
+       depends on TIMA
        default n
        help
          Kernel bits of the TIMA test infrastructure
diff --git a/init/Kconfig b/init/Kconfig
index 192589a1627..bdb57a55747 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1379,7 +1379,6 @@ config BASE_SMALL
 
 menuconfig MODULES
 	bool "Enable loadable module support"
-	select TIMA_LKMAUTH
 	help
 	  Kernel modules are small pieces of compiled code which can
 	  be inserted in the running kernel, rather than being