diff --git a/[refs] b/[refs] index 6a772168f4dd..d048f77454aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da8bacf6d59288ef3e41389db24886c928dcbd33 +refs/heads/master: 4f3a151a11da3351e2149a401d4ee18426938de7 diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig index 9c45b983e0de..1a04db4552da 100644 --- a/trunk/drivers/media/common/Kconfig +++ b/trunk/drivers/media/common/Kconfig @@ -1,6 +1,6 @@ config VIDEO_SAA7146 tristate - select I2C + depends on I2C config VIDEO_SAA7146_VV tristate diff --git a/trunk/drivers/media/dvb/pluto2/Kconfig b/trunk/drivers/media/dvb/pluto2/Kconfig index 48252e9ce586..7d8e6e87bdbb 100644 --- a/trunk/drivers/media/dvb/pluto2/Kconfig +++ b/trunk/drivers/media/dvb/pluto2/Kconfig @@ -1,7 +1,6 @@ config DVB_PLUTO2 tristate "Pluto2 cards" depends on DVB_CORE && PCI && I2C - select I2C select I2C_ALGOBIT select DVB_TDA1004X help