diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /drivers/media/dvb/Kconfig | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
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 ee214c3b63d7..f6e40b3a44cc 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -80,6 +80,10 @@ comment "Supported nGene Adapters" | |||
| 80 | depends on DVB_CORE && PCI && I2C | 80 | depends on DVB_CORE && PCI && I2C |
| 81 | source "drivers/media/dvb/ngene/Kconfig" | 81 | source "drivers/media/dvb/ngene/Kconfig" |
| 82 | 82 | ||
| 83 | comment "Supported ddbridge ('Octopus') Adapters" | ||
| 84 | depends on DVB_CORE && PCI && I2C | ||
| 85 | source "drivers/media/dvb/ddbridge/Kconfig" | ||
| 86 | |||
| 83 | comment "Supported DVB Frontends" | 87 | comment "Supported DVB Frontends" |
| 84 | depends on DVB_CORE | 88 | depends on DVB_CORE |
| 85 | source "drivers/media/dvb/frontends/Kconfig" | 89 | source "drivers/media/dvb/frontends/Kconfig" |