android: skip building drivers as modules
Few Android drivers e.g. uid_cputime and PPPoLAC/oPNS,
keyreset/combo, cpufreq_interactive etc.. fail to build
as kernel modules. Instead of fixing the build lets
make these drivers non-modular (switch config to "bool"
from "tristate" in Kconfig) since Android doesn't
support building kernel modules anyway.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 6e099e5..75f63ef 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -170,7 +170,7 @@
If in doubt, say N.
config CPU_FREQ_GOV_INTERACTIVE
- tristate "'interactive' cpufreq policy governor"
+ bool "'interactive' cpufreq policy governor"
help
'interactive' - This driver adds a dynamic cpufreq policy governor
designed for latency-sensitive workloads.
@@ -179,9 +179,6 @@
increases so that the system is more responsive to
interactive workloads.
- To compile this driver as a module, choose M here: the
- module will be called cpufreq_interactive.
-
For details, take a look at linux/Documentation/cpu-freq.
If in doubt, say N.
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 4c1e2a7..2557dcd 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -188,24 +188,18 @@
module will be called apm-power.
config INPUT_KEYRESET
- tristate "Reset key"
+ bool "Reset key"
depends on INPUT
select INPUT_KEYCOMBO
---help---
Say Y here if you want to reboot when some keys are pressed;
- To compile this driver as a module, choose M here: the
- module will be called keyreset.
-
config INPUT_KEYCOMBO
- tristate "Key combo"
+ bool "Key combo"
depends on INPUT
---help---
Say Y here if you want to take action when some keys are pressed;
- To compile this driver as a module, choose M here: the
- module will be called keycombo.
-
comment "Input Device Drivers"
source "drivers/input/keyboard/Kconfig"
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0527305..98c020b 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -530,7 +530,7 @@
of generating transactions on this bus.
config UID_CPUTIME
- tristate "Per-UID cpu time statistics"
+ bool "Per-UID cpu time statistics"
depends on PROFILING
help
Per UID based cpu time statistics exported to /proc/uid_cputime
diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 282aec4..e4cf44b 100644
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -150,7 +150,7 @@
if TTY
config PPPOLAC
- tristate "PPP on L2TP Access Concentrator"
+ bool "PPP on L2TP Access Concentrator"
depends on PPP && INET
help
L2TP (RFC 2661) is a tunneling protocol widely used in virtual private
@@ -159,7 +159,7 @@
fairly simple and suited for clients.
config PPPOPNS
- tristate "PPP on PPTP Network Server"
+ bool "PPP on PPTP Network Server"
depends on PPP && INET
help
PPTP (RFC 2637) is a tunneling protocol widely used in virtual private