Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / android / Kconfig

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index eb1dee2..0e16b59 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -25,17 +25,9 @@ config ANDROID_LOGGER
        tristate "Android log driver"
        default n
 
-config ANDROID_PERSISTENT_RAM
-       bool
-       depends on HAVE_MEMBLOCK
-       select REED_SOLOMON
-       select REED_SOLOMON_ENC8
-       select REED_SOLOMON_DEC8
-
 config ANDROID_RAM_CONSOLE
        bool "Android RAM buffer console"
-       depends on !S390 && !UML && HAVE_MEMBLOCK
-       select ANDROID_PERSISTENT_RAM
+       depends on !S390 && !UML && HAVE_MEMBLOCK && PSTORE_RAM=y
        default n
 
 config ANDROID_TIMED_OUTPUT
@@ -53,33 +45,14 @@ config ANDROID_LOW_MEMORY_KILLER
        ---help---
          Register processes to be killed when memory is low
 
-source "drivers/staging/android/switch/Kconfig"
-
-config ANDROID_INTF_ALARM
+config ANDROID_INTF_ALARM_DEV
        bool "Android alarm driver"
        depends on RTC_CLASS
        default n
        help
          Provides non-wakeup and rtc backed wakeup alarms based on rtc or
          elapsed realtime, and a non-wakeup alarm on the monotonic clock.
-         Also provides an interface to set the wall time which must be used
-         for elapsed realtime to work.
-
-config ANDROID_INTF_ALARM_DEV
-       bool "Android alarm device"
-       depends on ANDROID_INTF_ALARM
-       default y
-       help
-         Exports the alarm interface to user-space.
-
-config ANDROID_ALARM_OLDDRV_COMPAT
-       bool "Android Alarm compatability with old drivers"
-       depends on ANDROID_INTF_ALARM
-       default n
-       help
-         Provides preprocessor alias to aid compatability with
-         older out-of-tree drivers that use the Android Alarm
-         in-kernel API. This will be removed eventually.
+         Also exports the alarm interface to user-space.
 
 endif # if ANDROID