diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /drivers/media/video/Kconfig | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index f8fc8654693d..9644cf760aaa 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -361,7 +361,7 @@ config VIDEO_SAA717X | |||
| 361 | 361 | ||
| 362 | config VIDEO_SAA7191 | 362 | config VIDEO_SAA7191 |
| 363 | tristate "Philips SAA7191 video decoder" | 363 | tristate "Philips SAA7191 video decoder" |
| 364 | depends on VIDEO_V4L1 && I2C | 364 | depends on VIDEO_V4L2 && I2C |
| 365 | ---help--- | 365 | ---help--- |
| 366 | Support for the Philips SAA7191 video decoder. | 366 | Support for the Philips SAA7191 video decoder. |
| 367 | 367 | ||
| @@ -756,7 +756,7 @@ source "drivers/media/video/saa7134/Kconfig" | |||
| 756 | 756 | ||
| 757 | config VIDEO_MXB | 757 | config VIDEO_MXB |
| 758 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" | 758 | tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" |
| 759 | depends on PCI && VIDEO_V4L1 && I2C | 759 | depends on PCI && VIDEO_V4L2 && I2C |
| 760 | select VIDEO_SAA7146_VV | 760 | select VIDEO_SAA7146_VV |
| 761 | select VIDEO_TUNER | 761 | select VIDEO_TUNER |
| 762 | select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO | 762 | select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO |