---

yaml
---
r: 226337
b: refs/heads/master
c: 5772dca
h: refs/heads/master
i:
  226335: adb85f9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7
+refs/heads/master: 5772dcaa790851ec068afcd0d1f160d801b1126e

trunk/drivers/media/video/usbvideo/Kconfig

@@ -10,36 +10,3 @@ config USB_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 (DEPRECATED)"
-	depends on VIDEO_V4L1
-	select VIDEO_USBVIDEO
-	---help---
-	  This driver is DEPRECATED please use the gspca xirlink_cit module
-	  instead.
-
-	  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.
-
-	  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/video4linux/ibmcam.txt> to learn more.
-
-config USB_KONICAWC
-	tristate "USB Konica Webcam support (DEPRECATED)"
-	depends on VIDEO_V4L1
-	select VIDEO_USBVIDEO
-	---help---
-	  This driver is DEPRECATED (and known to crash) please use the
-	  gspca konica module instead.
-
-	  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.
-

trunk/drivers/media/video/usbvideo/Makefile

@@ -1,4 +1,2 @@
 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