Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330916
b: refs/heads/master
c: e9d2f05
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Aug 21, 2012
1 parent c6d6911 commit e06375b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8511f8eaa86bb16e4e2bd5f30d5f12764f59ae8d
refs/heads/master: e9d2f0573e918d0b2ed08ece1c4bfe850477f8cf
2 changes: 1 addition & 1 deletion trunk/drivers/media/i2c/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ config VIDEO_M52790
To compile this driver as a module, choose M here: the
module will be called m52790.
endmenu

menu "Sensors used on soc_camera driver"

if SOC_CAMERA
Expand Down
5 changes: 4 additions & 1 deletion trunk/drivers/media/parport/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
menuconfig MEDIA_PARPORT_SUPPORT
bool "V4L ISA and parallel port devices"
bool "ISA and parallel port devices"
depends on (ISA || PARPORT) && MEDIA_CAMERA_SUPPORT
help
Enables drivers for ISA and parallel port bus. If you
need media drivers using those legacy buses, say Y.

if MEDIA_PARPORT_SUPPORT
config VIDEO_BWQCAM
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/media/pci/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
menuconfig MEDIA_PCI_SUPPORT
bool "Media PCI Adapters"
depends on PCI && MEDIA_SUPPORT
help
Enable media drivers for PCI/PCIe bus.
If you have such devices, say Y.

if MEDIA_PCI_SUPPORT

Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/media/usb/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
menuconfig MEDIA_USB_SUPPORT
bool "Media USB Adapters"
depends on USB && MEDIA_SUPPORT
help
Enable media drivers for USB bus.
If you have such devices, say Y.

if MEDIA_USB_SUPPORT

Expand Down

0 comments on commit e06375b

Please sign in to comment.