Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 2963605c0ecc..d7f1fd5b7b02 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -1,6 +1,6 @@
 config DVB_B2C2_FLEXCOP
         tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
-        depends on DVB_CORE
+        depends on DVB_CORE && I2C
         select DVB_STV0299
         select DVB_MT352
         select DVB_MT312
@@ -16,7 +16,7 @@ config DVB_B2C2_FLEXCOP
 
 config DVB_B2C2_FLEXCOP_PCI
         tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
-        depends on DVB_B2C2_FLEXCOP && PCI
+        depends on DVB_B2C2_FLEXCOP && PCI && I2C
         help
           Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
 
@@ -24,7 +24,7 @@ config DVB_B2C2_FLEXCOP_PCI
 
 config DVB_B2C2_FLEXCOP_USB
         tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
-        depends on DVB_B2C2_FLEXCOP && USB
+        depends on DVB_B2C2_FLEXCOP && USB && I2C
         help
           Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,