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 6e099e577578e560cd84d7c69d3f3a1347553ac1..75f63efd7b43144e07561c565a62cbe41b4450af 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -170,7 +170,7 @@ config CPU_FREQ_GOV_ONDEMAND
          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 @@ config CPU_FREQ_GOV_INTERACTIVE
          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 4c1e2a74276cae485256e9997c3f862b8cc78b7d..2557dcda7621a1dbe58ae54caef6bc85025207f3 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -188,24 +188,18 @@ config INPUT_APMPOWER
          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 052730540ab4dbe276ca4f24c434d7ec4d96960a..98c020b560ac914f74345d5a24c88f4e2af4150e 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -530,7 +530,7 @@ config VEXPRESS_SYSCFG
          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 282aec4860ebe56b6097a3d6a20da7725c103e2c..e4cf44b1e8151d8fd6ae8f610a919841b9ddab5d 100644 (file)
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -150,7 +150,7 @@ config PPPOL2TP
 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 @@ config PPPOLAC
          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