diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/media/dvb/Kconfig | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/media/dvb/Kconfig')
| -rw-r--r-- | drivers/media/dvb/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index 35d0817126e9..cf8f65f309da 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -72,6 +72,10 @@ comment "Supported Earthsoft PT1 Adapters" | |||
| 72 | depends on DVB_CORE && PCI && I2C | 72 | depends on DVB_CORE && PCI && I2C |
| 73 | source "drivers/media/dvb/pt1/Kconfig" | 73 | source "drivers/media/dvb/pt1/Kconfig" |
| 74 | 74 | ||
| 75 | comment "Supported Mantis Adapters" | ||
| 76 | depends on DVB_CORE && PCI && I2C | ||
| 77 | source "drivers/media/dvb/mantis/Kconfig" | ||
| 78 | |||
| 75 | comment "Supported DVB Frontends" | 79 | comment "Supported DVB Frontends" |
| 76 | depends on DVB_CORE | 80 | depends on DVB_CORE |
| 77 | source "drivers/media/dvb/frontends/Kconfig" | 81 | source "drivers/media/dvb/frontends/Kconfig" |