Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index 9c4ef50..cfcd9a3
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -401,6 +401,21 @@ config EP93XX_PWM
          To compile this driver as a module, choose M here: the module will
          be called ep93xx_pwm.
 
+config STE
+       bool "STE modem control driver"
+       
+config MTK23D
+       bool "MTK6223D modem control driver"
+
+config FM580X
+       bool "FM rda580x driver"
+       
+config MU509
+       bool "MU509 modem control driver"
+       
+config RK29_NEWTON
+       bool "RK29_NEWTON misc driver"
+
 config DS1682
        tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
        depends on I2C && EXPERIMENTAL
@@ -499,6 +514,9 @@ config TEGRA_CRYPTO_DEV
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
+source "drivers/misc/rk29_modem/Kconfig"
+source "drivers/misc/gps/Kconfig"
+source "drivers/misc/mpu3050/Kconfig"
 source "drivers/misc/ts27010mux/Kconfig"
 source "drivers/misc/iwmc3200top/Kconfig"
 source "drivers/misc/radio_ctrl/Kconfig"