summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-12-27 14:43:41 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-27 14:47:59 -0200
commit5d92bbe634cc9d768db2b88ca7c303e6799ed5c0 (patch)
treed79b86ecc9d1792e93902835d3c918437316d1cf
parent68c97bf39ad853063876f4a8449009c1620d972a (diff)
downloadlinux-5d92bbe634cc9d768db2b88ca7c303e6799ed5c0.tar.gz
linux-5d92bbe634cc9d768db2b88ca7c303e6799ed5c0.tar.bz2
linux-5d92bbe634cc9d768db2b88ca7c303e6799ed5c0.zip
[media] ttpci: Fix a missing Kconfig dependency
Fix a Kconfig warning that appears with allmodconfig on arm: warning: (DVB_USB_PCTV452E) selects TTPCI_EEPROM which has unmet direct dependencies (MEDIA_SUPPORT && MEDIA_PCI_SUPPORT && MEDIA_DIGITAL_TV_SUPPORT && I2C) Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/Kconfig6
-rw-r--r--drivers/media/pci/ttpci/Kconfig5
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 4ef0d80b57f4..4d9b4c21c199 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -135,6 +135,12 @@ config DVB_NET
You may want to disable the network support on embedded devices. If
unsure say Y.
+# This Kconfig option is used by both PCI and USB drivers
+config TTPCI_EEPROM
+ tristate
+ depends on I2C
+ default n
+
source "drivers/media/dvb-core/Kconfig"
comment "Media drivers"
diff --git a/drivers/media/pci/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig
index 314e417addae..0dcb8cd77676 100644
--- a/drivers/media/pci/ttpci/Kconfig
+++ b/drivers/media/pci/ttpci/Kconfig
@@ -1,8 +1,3 @@
-config TTPCI_EEPROM
- tristate
- depends on I2C
- default n
-
config DVB_AV7110
tristate "AV7110 cards"
depends on DVB_CORE && PCI && I2C