diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 13:44:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 13:44:24 -0400 |
| commit | 1547ac893acbf87738ded0b470e2735fdfba6947 (patch) | |
| tree | 26d0f08d2f198a45ec40b1f2a6f20eed1a7cb785 /drivers/media/video/cx23885 | |
| parent | a30bfd6cd47f387e060fb06d2ba688a491e6eaec (diff) | |
| parent | 2b80163c390b593bad313f64948993475bfd6069 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB: v4l2-ctrls.c: needs to include slab.h
V4L/DVB: fix Kconfig to depends on VIDEO_IR
V4L/DVB: Fix IR_CORE dependencies
Diffstat (limited to 'drivers/media/video/cx23885')
| -rw-r--r-- | drivers/media/video/cx23885/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index 768f000e4b21..e1367b35647a 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig | |||
| @@ -5,7 +5,7 @@ config VIDEO_CX23885 | |||
| 5 | select VIDEO_BTCX | 5 | select VIDEO_BTCX |
| 6 | select VIDEO_TUNER | 6 | select VIDEO_TUNER |
| 7 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |
| 8 | select IR_CORE | 8 | depends on IR_CORE |
| 9 | select VIDEOBUF_DVB | 9 | select VIDEOBUF_DVB |
| 10 | select VIDEOBUF_DMA_SG | 10 | select VIDEOBUF_DMA_SG |
| 11 | select VIDEO_CX25840 | 11 | select VIDEO_CX25840 |