diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/dm1105/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/dm1105/Kconfig')
| -rw-r--r-- | drivers/media/dvb/dm1105/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig index a6ceb08f1183..f3de0a4d63f2 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 RC_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 |