Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 15dbd8c..2dc02c9 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -696,33 +696,11 @@ config INTEL_MID_POWER_BUTTON
 
 config INTEL_MFLD_THERMAL
        tristate "Thermal driver for Intel Medfield platform"
-       depends on INTEL_SCU_IPC && THERMAL
+       depends on MFD_INTEL_MSIC && THERMAL
        help
          Say Y here to enable thermal driver support for the  Intel Medfield
          platform.
 
-config RAR_REGISTER
-       bool "Restricted Access Region Register Driver"
-       depends on PCI && X86_MRST
-       default n
-       ---help---
-         This driver allows other kernel drivers access to the
-         contents of the restricted access region control registers.
-
-         The restricted access region control registers
-         (rar_registers) are used to pass address and
-         locking information on restricted access regions
-         to other drivers that use restricted access regions.
-
-         The restricted access regions are regions of memory
-         on the Intel MID Platform that are not accessible to
-         the x86 processor, but are accessible to dedicated
-         processors on board peripheral devices.
-
-         The purpose of the restricted access regions is to
-         protect sensitive data from compromise by unauthorized
-         programs running on the x86 processor.
-
 config INTEL_IPS
        tristate "Intel Intelligent Power Sharing"
        depends on ACPI