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 omap-drivers
[pandora-kernel.git]
/
drivers
/
media
/
video
/
Kconfig
diff --git
a/drivers/media/video/Kconfig
b/drivers/media/video/Kconfig
index
bc77378
..
653842c
100644
(file)
--- a/
drivers/media/video/Kconfig
+++ b/
drivers/media/video/Kconfig
@@
-777,4
+777,6
@@
config USB_ZR364XX
endmenu # V4L USB devices
+source drivers/media/video/omap/Kconfig
+
endmenu