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 with /home/tmlind/src/kernel/linux-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
Kconfig
diff --git
a/drivers/media/video/Kconfig
b/drivers/media/video/Kconfig
index
fe56862
..
3e1d9cc
100644
(file)
--- a/
drivers/media/video/Kconfig
+++ b/
drivers/media/video/Kconfig
@@
-536,4
+536,6
@@
source "drivers/media/video/pwc/Kconfig"
endmenu # V4L USB devices
+source drivers/media/video/omap/Kconfig
+
endmenu