Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / drivers / platform / x86 / Kconfig

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index fb739b2..ee93dcd 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -751,6 +751,7 @@ config THINKPAD_ACPI_HOTKEY_POLL
 config INTEL_ATOMISP2_PM
        tristate "Intel AtomISP2 dummy / power-management driver"
        depends on PCI && IOSF_MBI && PM
+       depends on !INTEL_ATOMISP
        help
          Power-management driver for Intel's Image Signal Processor found on
          Bay Trail and Cherry Trail devices. This dummy driver's sole purpose