---

yaml
---
r: 25150
b: refs/heads/master
c: e4a25ed
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 328caac78a69fa60be67002e4e7dfab3da87dc64
+refs/heads/master: e4a25edb5ecdf14aa14b909acc6f354e4c8f080c

trunk/drivers/media/video/Kconfig

@@ -395,17 +395,7 @@ config USB_DSBR
 	  To compile this driver as a module, choose M here: the
 	  module will be called dsbr100.
 
-config USB_ET61X251
-	tristate "USB ET61X[12]51 PC Camera Controller support"
-	depends on USB && VIDEO_DEV
-	---help---
-	  Say Y here if you want support for cameras based on Etoms ET61X151
-	  or ET61X251 PC Camera Controllers.
-
-	  See <file:Documentation/usb/et61x251.txt> for more informations.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called et61x251.
+source "drivers/media/video/et61x251/Kconfig"
 
 config USB_IBMCAM
 	tristate "USB IBM (Xirlink) C-it Camera support"

trunk/drivers/media/video/Makefile

@@ -65,7 +65,6 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/
 obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
 obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
 
-et61x251-objs   := et61x251_core.o et61x251_tas5130d1b.o
 zc0301-objs     := zc0301_core.o zc0301_pas202bcb.o
 
 obj-$(CONFIG_USB_DABUSB)        += dabusb.o

trunk/drivers/media/video/et61x251/Kconfig

@@ -0,0 +1,14 @@
+config USB_ET61X251
+	tristate "USB ET61X[12]51 PC Camera Controller support"
+	depends on USB && VIDEO_DEV
+	---help---
+	  Say Y here if you want support for cameras based on Etoms ET61X151
+	  or ET61X251 PC Camera Controllers.
+
+	  See <file:Documentation/usb/et61x251.txt> for more informations.
+
+	  This driver uses the Video For Linux API. You must say Y or M to
+	  "Video For Linux" to use this driver.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called et61x251.