diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
| commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
| tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /drivers/media/dvb/ttpci/Kconfig | |
| parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 (diff) | |
| parent | 70ff05554f91a1edda1f11684da1dbde09e2feea (diff) | |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/ttpci/Kconfig')
| -rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index d4339b1b3b68..07643e010093 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -101,6 +101,7 @@ config DVB_BUDGET | |||
| 101 | config DVB_BUDGET_CI | 101 | config DVB_BUDGET_CI |
| 102 | tristate "Budget cards with onboard CI connector" | 102 | tristate "Budget cards with onboard CI connector" |
| 103 | depends on DVB_BUDGET_CORE && I2C | 103 | depends on DVB_BUDGET_CORE && I2C |
| 104 | depends on INPUT # due to IR | ||
| 104 | select DVB_STV0297 if !DVB_FE_CUSTOMISE | 105 | select DVB_STV0297 if !DVB_FE_CUSTOMISE |
| 105 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 106 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
| 106 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 107 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |