---

yaml --- r: 114059 b: refs/heads/master c: 4918312 h: refs/heads/master i: 114057: 92666ff 114055: 547beb4 v: v3
git-mirror · Oct 12, 2008 · 3304a98 · 3304a98
1 parent 4e222c8
commit 3304a98
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e66c6419231cd61a1be04ef84bc6264556289e7d
+refs/heads/master: 491831260e94475d14d5465b424df955d1f20aac
diff --git a/trunk/drivers/media/video/gspca/Kconfig b/trunk/drivers/media/video/gspca/Kconfig
@@ -37,6 +37,15 @@ config USB_GSPCA_ETOMS
 	To compile this driver as a module, choose M here: the
 	module will be called gspca_etoms.
 
+config USB_GSPCA_FINEPIX
+	tristate "Fujifilm FinePix USB V4L2 driver"
+	depends on VIDEO_V4L2 && USB_GSPCA
+	help
+	Say Y here if you want support for cameras based on the FinePix chip.
+
+	To compile this driver as a module, choose M here: the
+	module will be called gspca_finepix.
+
 config USB_GSPCA_MARS
 	tristate "Mars USB Camera Driver"
 	depends on VIDEO_V4L2 && USB_GSPCA

diff --git a/trunk/drivers/media/video/gspca/Makefile b/trunk/drivers/media/video/gspca/Makefile
@@ -1,6 +1,7 @@
 obj-$(CONFIG_USB_GSPCA)		+= gspca_main.o
 obj-$(CONFIG_USB_GSPCA_CONEX)	+= gspca_conex.o
 obj-$(CONFIG_USB_GSPCA_ETOMS)	+= gspca_etoms.o
+obj-$(CONFIG_USB_GSPCA_FINEPIX)	+= gspca_finepix.o
 obj-$(CONFIG_USB_GSPCA_MARS)	+= gspca_mars.o
 obj-$(CONFIG_USB_GSPCA_OV519)	+= gspca_ov519.o
 obj-$(CONFIG_USB_GSPCA_PAC207)	+= gspca_pac207.o
@@ -23,6 +24,7 @@ obj-$(CONFIG_USB_GSPCA_ZC3XX)	+= gspca_zc3xx.o
 gspca_main-objs			:= gspca.o
 gspca_conex-objs		:= conex.o
 gspca_etoms-objs		:= etoms.o
+gspca_finepix-objs		:= finepix.o
 gspca_mars-objs			:= mars.o
 gspca_ov519-objs		:= ov519.o
 gspca_pac207-objs		:= pac207.o