diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
commit | 835d39fcb56cba00b78c60634d6bb0f046ef601c (patch) | |
tree | 235cecc646bada5c0b76836d42e44e7a5d93c0f8 /drivers/media/dvb/pluto2/Kconfig | |
parent | 89bad5892abca55f56d0ea713c7306d1f845ac8e (diff) | |
parent | ecd68853b852cdafb138f9c437f3a751fe7dc381 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/dvb/pluto2/Kconfig')
-rw-r--r-- | drivers/media/dvb/pluto2/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/pluto2/Kconfig b/drivers/media/dvb/pluto2/Kconfig index 48252e9ce58..7d8e6e87bdb 100644 --- a/drivers/media/dvb/pluto2/Kconfig +++ b/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 |