Merge branch 'master'

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
index 21232ee2974c..0d3d2cc5d7be 100644
--- a/drivers/usb/media/Kconfig
+++ b/drivers/usb/media/Kconfig
@@ -53,6 +53,21 @@ 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.
+
+          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.
+
 config USB_IBMCAM
         tristate "USB IBM (Xirlink) C-it Camera support"
         depends on USB && VIDEO_DEV
@@ -209,5 +224,3 @@ config USB_PWC
 
           To compile this driver as a module, choose M here: the
           module will be called pwc.
-
-