diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:17:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-10 02:17:26 -0400 |
| commit | e161183ba674f97fce748384f5bb037d07bdc5c9 (patch) | |
| tree | 5b3bd4b995f6435ee977b71082244fa1a647f717 /drivers/media/dvb/Kconfig | |
| parent | 2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 40ebde53b3ce..b0198691892a 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -51,6 +51,10 @@ comment "Supported SDMC DM1105 Adapters" | |||
| 51 | depends on DVB_CORE && PCI && I2C | 51 | depends on DVB_CORE && PCI && I2C |
| 52 | source "drivers/media/dvb/dm1105/Kconfig" | 52 | source "drivers/media/dvb/dm1105/Kconfig" |
| 53 | 53 | ||
| 54 | comment "Supported FireWire (IEEE 1394) Adapters" | ||
| 55 | depends on DVB_CORE && IEEE1394 | ||
| 56 | source "drivers/media/dvb/firewire/Kconfig" | ||
| 57 | |||
| 54 | comment "Supported DVB Frontends" | 58 | comment "Supported DVB Frontends" |
| 55 | depends on DVB_CORE | 59 | depends on DVB_CORE |
| 56 | source "drivers/media/dvb/frontends/Kconfig" | 60 | source "drivers/media/dvb/frontends/Kconfig" |