From 0101c0776e14365e3df25a35c88d4d9454b86903 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 27 Dec 2012 14:43:41 -0200 Subject: [PATCH] --- yaml --- r: 357173 b: refs/heads/master c: 5d92bbe634cc9d768db2b88ca7c303e6799ed5c0 h: refs/heads/master i: 357171: 84e48ad62ae7e8b0dd9ae618a91c1df61275df2b v: v3 --- [refs] | 2 +- trunk/drivers/media/Kconfig | 6 ++++++ trunk/drivers/media/pci/ttpci/Kconfig | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 53e6eb2ee73a..9bc721e99b1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68c97bf39ad853063876f4a8449009c1620d972a +refs/heads/master: 5d92bbe634cc9d768db2b88ca7c303e6799ed5c0 diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig index 4ef0d80b57f4..4d9b4c21c199 100644 --- a/trunk/drivers/media/Kconfig +++ b/trunk/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/trunk/drivers/media/pci/ttpci/Kconfig b/trunk/drivers/media/pci/ttpci/Kconfig index 314e417addae..0dcb8cd77676 100644 --- a/trunk/drivers/media/pci/ttpci/Kconfig +++ b/trunk/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