git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
drivers
/
media
/
common
/
Kconfig
diff --git
a/drivers/media/common/Kconfig
b/drivers/media/common/Kconfig
index
c5092ef
..
769c6f8
100644
(file)
--- a/
drivers/media/common/Kconfig
+++ b/
drivers/media/common/Kconfig
@@
-1,9
+1,9
@@
config VIDEO_SAA7146
tristate
- depends on I2C
+ depends on I2C
&& PCI
config VIDEO_SAA7146_VV
tristate
- depends on VIDEO_
DEV
+ depends on VIDEO_
V4L2
select VIDEOBUF_DMA_SG
select VIDEO_SAA7146