Merge tag 'platform-drivers-x86-v4.11-1' of git://git.infradead.org/linux-platform...

[mirror_ubuntu-artful-kernel.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d6fbfc0fd2de675938728b67b6e5e312d56c47f7..4bc88eb52712c7a8231ac64b94bbfacd5607f1f5 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -814,13 +814,6 @@ config INTEL_SCU_IPC_UTIL
          low level access for debug work and updating the firmware. Say
          N unless you will be doing this on an Intel MID platform.
 
-config GPIO_INTEL_PMIC
-       bool "Intel PMIC GPIO support"
-       depends on INTEL_SCU_IPC && GPIOLIB
-       ---help---
-         Say Y here to support GPIO via the SCU IPC interface
-         on Intel MID platforms.
-
 config INTEL_MID_POWER_BUTTON
        tristate "power button driver for Intel MID platforms"
        depends on INTEL_SCU_IPC && INPUT
@@ -1096,3 +1089,8 @@ config SILEAD_DMI
          information. Enable this for x86 tablets with Silead touchscreens.
 
 endif # X86_PLATFORM_DEVICES
+
+config PMC_ATOM
+       def_bool y
+       depends on PCI
+       select COMMON_CLK