summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-05-07 10:19:59 -0400
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-05-20 12:32:20 +0200
commit1ab709827c08619c7b2401ea7e0769a9b70846fe (patch)
tree9c284d6a99f720602fad3026d33f16a45f624da6 /drivers/platform
parent32efca3d55799b3e644e1ceca10e2f3b6b6eb76a (diff)
downloadlinux-1ab709827c08619c7b2401ea7e0769a9b70846fe.tar.gz
linux-1ab709827c08619c7b2401ea7e0769a9b70846fe.tar.bz2
linux-1ab709827c08619c7b2401ea7e0769a9b70846fe.zip
media: atomisp: disable the dummy PM driver is atomisp driver is built
As the atomisp driver should already be handling the ISP PCI ID, there's no sense on keeping the dummy driver enabled in tis case. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0ad7ad8cf8e1..c257072a7c35 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -741,6 +741,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