---

yaml --- r: 357173 b: refs/heads/master c: 5d92bbe h: refs/heads/master i: 357171: 84e48ad v: v3
git-mirror · Dec 27, 2012 · 0101c07 · 0101c07
1 parent daf4211
commit 0101c07
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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