diff options
author | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/media/common/Kconfig | |
parent | Input: add the fn key to hid-debug.h (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.zip |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/media/common/Kconfig')
-rw-r--r-- | drivers/media/common/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index caebd0a1c021..6a901a0268e1 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig @@ -1,12 +1,12 @@ config VIDEO_SAA7146 - tristate + tristate select I2C config VIDEO_SAA7146_VV - tristate + tristate select VIDEO_BUF select VIDEO_VIDEOBUF select VIDEO_SAA7146 config VIDEO_VIDEOBUF - tristate + tristate |