/[linux-patches]/genpatches-2.6/trunk/2.6.16/2710_dvb-i2c-depends.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.16/2710_dvb-i2c-depends.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 481 Revision 482
9 9
10Signed-off-by: Manu Abraham <manu@linuxtv.org> 10Signed-off-by: Manu Abraham <manu@linuxtv.org>
11Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> 11Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
12--- 12---
13 13
14--- a/drivers/media/dvb/Kconfig 14Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/Kconfig
15+++ b/drivers/media/dvb/Kconfig 15===================================================================
16--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/Kconfig
17+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/Kconfig
16@@ -22,26 +22,26 @@ config DVB 18@@ -22,26 +22,26 @@ config DVB
17 source "drivers/media/dvb/dvb-core/Kconfig" 19 source "drivers/media/dvb/dvb-core/Kconfig"
18 20
19 comment "Supported SAA7146 based PCI Adapters" 21 comment "Supported SAA7146 based PCI Adapters"
20- depends on DVB_CORE && PCI 22- depends on DVB_CORE && PCI
43- depends on DVB_CORE && PCI 45- depends on DVB_CORE && PCI
44+ depends on DVB_CORE && PCI && I2C 46+ depends on DVB_CORE && PCI && I2C
45 source "drivers/media/dvb/pluto2/Kconfig" 47 source "drivers/media/dvb/pluto2/Kconfig"
46 48
47 comment "Supported DVB Frontends" 49 comment "Supported DVB Frontends"
48--- a/drivers/media/dvb/b2c2/Kconfig 50Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/b2c2/Kconfig
51===================================================================
52--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/b2c2/Kconfig
49+++ b/drivers/media/dvb/b2c2/Kconfig 53+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/b2c2/Kconfig
50@@ -1,6 +1,6 @@ 54@@ -1,6 +1,6 @@
51 config DVB_B2C2_FLEXCOP 55 config DVB_B2C2_FLEXCOP
52 tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" 56 tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
53- depends on DVB_CORE 57- depends on DVB_CORE
54+ depends on DVB_CORE && I2C 58+ depends on DVB_CORE && I2C
71- depends on DVB_B2C2_FLEXCOP && USB 75- depends on DVB_B2C2_FLEXCOP && USB
72+ depends on DVB_B2C2_FLEXCOP && USB && I2C 76+ depends on DVB_B2C2_FLEXCOP && USB && I2C
73 help 77 help
74 Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2, 78 Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
75 79
76--- a/drivers/media/dvb/bt8xx/Kconfig 80Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/bt8xx/Kconfig
81===================================================================
82--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/bt8xx/Kconfig
77+++ b/drivers/media/dvb/bt8xx/Kconfig 83+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/bt8xx/Kconfig
78@@ -1,6 +1,6 @@ 84@@ -1,6 +1,6 @@
79 config DVB_BT8XX 85 config DVB_BT8XX
80 tristate "BT8xx based PCI cards" 86 tristate "BT8xx based PCI cards"
81- depends on DVB_CORE && PCI && VIDEO_BT848 87- depends on DVB_CORE && PCI && VIDEO_BT848
82+ depends on DVB_CORE && PCI && I2C && VIDEO_BT848 88+ depends on DVB_CORE && PCI && I2C && VIDEO_BT848
83 select DVB_MT352 89 select DVB_MT352
84 select DVB_SP887X 90 select DVB_SP887X
85 select DVB_NXT6000 91 select DVB_NXT6000
86--- a/drivers/media/dvb/dvb-usb/Kconfig 92Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/dvb-usb/Kconfig
93===================================================================
94--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/dvb-usb/Kconfig
87+++ b/drivers/media/dvb/dvb-usb/Kconfig 95+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/dvb-usb/Kconfig
88@@ -1,6 +1,6 @@ 96@@ -1,6 +1,6 @@
89 config DVB_USB 97 config DVB_USB
90 tristate "Support for various USB DVB devices" 98 tristate "Support for various USB DVB devices"
91- depends on DVB_CORE && USB 99- depends on DVB_CORE && USB
92+ depends on DVB_CORE && USB && I2C 100+ depends on DVB_CORE && USB && I2C
93 select FW_LOADER 101 select FW_LOADER
94 help 102 help
95 By enabling this you will be able to choose the various supported 103 By enabling this you will be able to choose the various supported
96--- a/drivers/media/dvb/pluto2/Kconfig 104Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/pluto2/Kconfig
105===================================================================
106--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/pluto2/Kconfig
97+++ b/drivers/media/dvb/pluto2/Kconfig 107+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/pluto2/Kconfig
98@@ -1,6 +1,6 @@ 108@@ -1,6 +1,6 @@
99 config DVB_PLUTO2 109 config DVB_PLUTO2
100 tristate "Pluto2 cards" 110 tristate "Pluto2 cards"
101- depends on DVB_CORE && PCI 111- depends on DVB_CORE && PCI
102+ depends on DVB_CORE && PCI && I2C 112+ depends on DVB_CORE && PCI && I2C
103 select I2C 113 select I2C
104 select I2C_ALGOBIT 114 select I2C_ALGOBIT
105 select DVB_TDA1004X 115 select DVB_TDA1004X
106--- a/drivers/media/dvb/ttpci/Kconfig 116Index: linux-2.6.16-gentoo-r9/drivers/media/dvb/ttpci/Kconfig
117===================================================================
118--- linux-2.6.16-gentoo-r9.orig/drivers/media/dvb/ttpci/Kconfig
107+++ b/drivers/media/dvb/ttpci/Kconfig 119+++ linux-2.6.16-gentoo-r9/drivers/media/dvb/ttpci/Kconfig
108@@ -1,6 +1,6 @@ 120@@ -1,6 +1,6 @@
109 config DVB_AV7110 121 config DVB_AV7110
110 tristate "AV7110 cards" 122 tristate "AV7110 cards"
111- depends on DVB_CORE && PCI && VIDEO_V4L1 123- depends on DVB_CORE && PCI
112+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 124+ depends on DVB_CORE && PCI && I2C
113 select FW_LOADER 125 select FW_LOADER
126 select VIDEO_DEV
114 select VIDEO_SAA7146_VV 127 select VIDEO_SAA7146_VV
115 select DVB_VES1820
116@@ -58,7 +58,7 @@ config DVB_AV7110_OSD 128@@ -59,7 +59,7 @@ config DVB_AV7110_OSD
117 129
118 config DVB_BUDGET 130 config DVB_BUDGET
119 tristate "Budget cards" 131 tristate "Budget cards"
120- depends on DVB_CORE && PCI && VIDEO_V4L1 132- depends on DVB_CORE && PCI
121+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 133+ depends on DVB_CORE && PCI && I2C
122 select VIDEO_SAA7146 134 select VIDEO_SAA7146
123 select DVB_STV0299 135 select DVB_STV0299
124 select DVB_VES1X93 136 select DVB_VES1X93
125@@ -79,7 +79,7 @@ config DVB_BUDGET 137@@ -80,7 +80,7 @@ config DVB_BUDGET
126 138
127 config DVB_BUDGET_CI 139 config DVB_BUDGET_CI
128 tristate "Budget cards with onboard CI connector" 140 tristate "Budget cards with onboard CI connector"
129- depends on DVB_CORE && PCI && VIDEO_V4L1 141- depends on DVB_CORE && PCI
130+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 142+ depends on DVB_CORE && PCI && I2C
131 select VIDEO_SAA7146 143 select VIDEO_SAA7146
132 select DVB_STV0297 144 select DVB_STV0297
133 select DVB_STV0299 145 select DVB_STV0299
134@@ -99,7 +99,7 @@ config DVB_BUDGET_CI 146@@ -100,7 +100,7 @@ config DVB_BUDGET_CI
135 147
136 config DVB_BUDGET_AV 148 config DVB_BUDGET_AV
137 tristate "Budget cards with analog video inputs" 149 tristate "Budget cards with analog video inputs"
138- depends on DVB_CORE && PCI && VIDEO_V4L1 150- depends on DVB_CORE && PCI
139+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 151+ depends on DVB_CORE && PCI && I2C
152 select VIDEO_DEV
140 select VIDEO_SAA7146_VV 153 select VIDEO_SAA7146_VV
141 select DVB_STV0299 154 select DVB_STV0299
142 select DVB_TDA1004X

Legend:
Removed from v.481  
changed lines
  Added in v.482

  ViewVC Help
Powered by ViewVC 1.1.20