Commit 26ffb95c authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3653f): usbvideo: fixed Kconfig menu and Makefile build configuration 



Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 43381eaf

drivers/media/video/Kconfig

+2 −34
Original line number Diff line number Diff line
@@ -374,15 +374,6 @@ menu "V4L USB devices" 


source "drivers/media/video/em28xx/Kconfig"



config USB_VICAM

	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"

	depends on USB && VIDEO_DEV && EXPERIMENTAL

	---help---

	  Say Y here if you have 3com homeconnect camera (vicam).



	  To compile this driver as a module, choose M here: the

	  module will be called vicam.



config USB_DSBR

	tristate "D-Link USB FM radio support (EXPERIMENTAL)"

	depends on USB && VIDEO_DEV && EXPERIMENTAL
@@ -395,32 +386,9 @@ config USB_DSBR 
	  To compile this driver as a module, choose M here: the

	  module will be called dsbr100.



source "drivers/media/video/et61x251/Kconfig"



config USB_IBMCAM

	tristate "USB IBM (Xirlink) C-it Camera support"

	depends on USB && VIDEO_DEV

	---help---

	  Say Y here if you want to connect a IBM "C-It" camera, also known as

	  "Xirlink PC Camera" to your computer's USB port.  For more

	  information, read <file:Documentation/usb/ibmcam.txt>.

source "drivers/media/video/usbvideo/Kconfig"



	  To compile this driver as a module, choose M here: the

	  module will be called ibmcam.



	  This camera has several configuration options which

	  can be specified when you load the module. Read

	  <file:Documentation/usb/ibmcam.txt> to learn more.



config USB_KONICAWC

	tristate "USB Konica Webcam support"

	depends on USB && VIDEO_DEV

	---help---

	  Say Y here if you want support for webcams based on a Konica

	  chipset. This is known to work with the Intel YC76 webcam.



	  To compile this driver as a module, choose M here: the

	  module will be called konicawc.

source "drivers/media/video/et61x251/Kconfig"



config USB_OV511

	tristate "USB OV511 Camera support"

drivers/media/video/usbvideo/Kconfig

0 → 100644
+39 −0
Original line number Diff line number Diff line 
config VIDEO_USBVIDEO

	tristate



config USB_VICAM

	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"

	depends on USB && VIDEO_DEV && EXPERIMENTAL

	select VIDEO_USBVIDEO

	---help---

	  Say Y here if you have 3com homeconnect camera (vicam).



	  To compile this driver as a module, choose M here: the

	  module will be called vicam.



config USB_IBMCAM

	tristate "USB IBM (Xirlink) C-it Camera support"

	depends on USB && VIDEO_DEV

	select VIDEO_USBVIDEO

	---help---

	  Say Y here if you want to connect a IBM "C-It" camera, also known as

	  "Xirlink PC Camera" to your computer's USB port.  For more

	  information, read <file:Documentation/usb/ibmcam.txt>.



	  To compile this driver as a module, choose M here: the

	  module will be called ibmcam.



	  This camera has several configuration options which

	  can be specified when you load the module. Read

	  <file:Documentation/usb/ibmcam.txt> to learn more.



config USB_KONICAWC

	tristate "USB Konica Webcam support"

	depends on USB && VIDEO_DEV

	select VIDEO_USBVIDEO

	---help---

	  Say Y here if you want support for webcams based on a Konica

	  chipset. This is known to work with the Intel YC76 webcam.



	  To compile this driver as a module, choose M here: the

	  module will be called konicawc.

drivers/media/video/usbvideo/Makefile

+4 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o usbvideo.o ultracam.o

obj-$(CONFIG_USB_KONICAWC)      += konicawc.o usbvideo.o

obj-$(CONFIG_USB_VICAM)         += vicam.o usbvideo.o

obj-$(CONFIG_VIDEO_USBVIDEO)    += usbvideo.o

obj-$(CONFIG_USB_IBMCAM)        += ibmcam.o ultracam.o

obj-$(CONFIG_USB_KONICAWC)      += konicawc.o

obj-$(CONFIG_USB_VICAM)         += vicam.o