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/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/Kconfig')
| -rw-r--r-- | drivers/media/dvb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig index 161ccfd471cb..ee214c3b63d7 100644 --- a/drivers/media/dvb/Kconfig +++ b/drivers/media/dvb/Kconfig | |||
| @@ -65,7 +65,7 @@ comment "Supported SDMC DM1105 Adapters" | |||
| 65 | source "drivers/media/dvb/dm1105/Kconfig" | 65 | source "drivers/media/dvb/dm1105/Kconfig" |
| 66 | 66 | ||
| 67 | comment "Supported FireWire (IEEE 1394) Adapters" | 67 | comment "Supported FireWire (IEEE 1394) Adapters" |
| 68 | depends on DVB_CORE && IEEE1394 | 68 | depends on DVB_CORE && FIREWIRE |
| 69 | source "drivers/media/dvb/firewire/Kconfig" | 69 | source "drivers/media/dvb/firewire/Kconfig" |
| 70 | 70 | ||
| 71 | comment "Supported Earthsoft PT1 Adapters" | 71 | comment "Supported Earthsoft PT1 Adapters" |