diff options
author | David Härdeman <david@hardeman.nu> | 2010-10-29 15:08:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:36 -0500 |
commit | 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0 (patch) | |
tree | 615e94196988cf5c37eeb80953d98fa4d9b91527 /drivers/media/dvb | |
parent | 62c6503125389763a74911408d984c5dd09eeb97 (diff) |
[media] ir-core: more cleanups of ir-functions.c
cx88 only depends on VIDEO_IR because it needs ir_extract_bits().
Move that function to ir-core.h and make it inline.
Lots of drivers had dependencies on VIDEO_IR when they really
wanted IR_CORE.
The only remaining drivers to depend on VIDEO_IR are bt8xx and
saa7134 (ir_rc5_timer_end is the only function exported by
ir-functions).
Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or
converting drivers to IR_CORE that they do not want a dependency
on IR_LEGACY.
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dm1105/Kconfig | 3 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig index a6ceb08f1183..576f3b70d792 100644 --- a/drivers/media/dvb/dm1105/Kconfig +++ b/drivers/media/dvb/dm1105/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config DVB_DM1105 | 1 | config DVB_DM1105 |
2 | tristate "SDMC DM1105 based PCI cards" | 2 | tristate "SDMC DM1105 based PCI cards" |
3 | depends on DVB_CORE && PCI && I2C | 3 | depends on DVB_CORE && PCI && I2C |
4 | depends on INPUT | ||
5 | select DVB_PLL if !DVB_FE_CUSTOMISE | 4 | select DVB_PLL if !DVB_FE_CUSTOMISE |
6 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 5 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
7 | select DVB_STV0288 if !DVB_FE_CUSTOMISE | 6 | select DVB_STV0288 if !DVB_FE_CUSTOMISE |
@@ -9,7 +8,7 @@ config DVB_DM1105 | |||
9 | select DVB_CX24116 if !DVB_FE_CUSTOMISE | 8 | select DVB_CX24116 if !DVB_FE_CUSTOMISE |
10 | select DVB_SI21XX if !DVB_FE_CUSTOMISE | 9 | select DVB_SI21XX if !DVB_FE_CUSTOMISE |
11 | select DVB_DS3000 if !DVB_FE_CUSTOMISE | 10 | select DVB_DS3000 if !DVB_FE_CUSTOMISE |
12 | depends on VIDEO_IR | 11 | depends on IR_CORE |
13 | help | 12 | help |
14 | Support for cards based on the SDMC DM1105 PCI chip like | 13 | Support for cards based on the SDMC DM1105 PCI chip like |
15 | DvbWorld 2002 | 14 | DvbWorld 2002 |
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index debea8d1d31c..0ffd6943da83 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
@@ -89,7 +89,6 @@ config DVB_BUDGET | |||
89 | config DVB_BUDGET_CI | 89 | config DVB_BUDGET_CI |
90 | tristate "Budget cards with onboard CI connector" | 90 | tristate "Budget cards with onboard CI connector" |
91 | depends on DVB_BUDGET_CORE && I2C | 91 | depends on DVB_BUDGET_CORE && I2C |
92 | depends on INPUT # due to IR | ||
93 | select DVB_STV0297 if !DVB_FE_CUSTOMISE | 92 | select DVB_STV0297 if !DVB_FE_CUSTOMISE |
94 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 93 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
95 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 94 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |
@@ -98,7 +97,7 @@ config DVB_BUDGET_CI | |||
98 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE | 97 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE |
99 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE | 98 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE |
100 | select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE | 99 | select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE |
101 | depends on VIDEO_IR | 100 | depends on IR_CORE |
102 | help | 101 | help |
103 | Support for simple SAA7146 based DVB cards | 102 | Support for simple SAA7146 based DVB cards |
104 | (so called Budget- or Nova-PCI cards) without onboard | 103 | (so called Budget- or Nova-PCI cards) without onboard |