Skip to content

Commit

Permalink
V4L/DVB (4037): Make the bridge devices that depend on I2C dependant …
Browse files Browse the repository at this point in the history
…on I2C

Ref: Bugzilla 6179, 6589

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed May 23, 2006
1 parent 9d8a51f commit 3c2c549
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions drivers/media/dvb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ config DVB
source "drivers/media/dvb/dvb-core/Kconfig"

comment "Supported SAA7146 based PCI Adapters"
depends on DVB_CORE && PCI
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ttpci/Kconfig"

comment "Supported USB Adapters"
depends on DVB_CORE && USB
depends on DVB_CORE && USB && I2C
source "drivers/media/dvb/dvb-usb/Kconfig"
source "drivers/media/dvb/ttusb-budget/Kconfig"
source "drivers/media/dvb/ttusb-dec/Kconfig"
source "drivers/media/dvb/cinergyT2/Kconfig"

comment "Supported FlexCopII (B2C2) Adapters"
depends on DVB_CORE && (PCI || USB)
depends on DVB_CORE && (PCI || USB) && I2C
source "drivers/media/dvb/b2c2/Kconfig"

comment "Supported BT878 Adapters"
depends on DVB_CORE && PCI
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/bt8xx/Kconfig"

comment "Supported Pluto2 Adapters"
depends on DVB_CORE && PCI
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/pluto2/Kconfig"

comment "Supported DVB Frontends"
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/dvb/b2c2/Kconfig
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,15 +16,15 @@ 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.

Say Y if you own such a device and want to use it.

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,

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/bt8xx/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config DVB_BT8XX
tristate "BT8xx based PCI cards"
depends on DVB_CORE && PCI && VIDEO_BT848
depends on DVB_CORE && PCI && I2C && VIDEO_BT848
select DVB_MT352
select DVB_SP887X
select DVB_NXT6000
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config DVB_USB
tristate "Support for various USB DVB devices"
depends on DVB_CORE && USB
depends on DVB_CORE && USB && I2C
select FW_LOADER
help
By enabling this you will be able to choose the various supported
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/pluto2/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config DVB_PLUTO2
tristate "Pluto2 cards"
depends on DVB_CORE && PCI
depends on DVB_CORE && PCI && I2C
select I2C
select I2C_ALGOBIT
select DVB_TDA1004X
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/dvb/ttpci/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config DVB_AV7110
tristate "AV7110 cards"
depends on DVB_CORE && PCI && VIDEO_V4L1
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select FW_LOADER
select VIDEO_SAA7146_VV
select DVB_VES1820
Expand Down Expand Up @@ -58,7 +58,7 @@ config DVB_AV7110_OSD

config DVB_BUDGET
tristate "Budget cards"
depends on DVB_CORE && PCI && VIDEO_V4L1
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146
select DVB_STV0299
select DVB_VES1X93
Expand All @@ -79,7 +79,7 @@ config DVB_BUDGET

config DVB_BUDGET_CI
tristate "Budget cards with onboard CI connector"
depends on DVB_CORE && PCI && VIDEO_V4L1
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146
select DVB_STV0297
select DVB_STV0299
Expand All @@ -99,7 +99,7 @@ config DVB_BUDGET_CI

config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs"
depends on DVB_CORE && PCI && VIDEO_V4L1
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146_VV
select DVB_STV0299
select DVB_TDA1004X
Expand Down

0 comments on commit 3c2c549

Please sign in to comment.