---

yaml
---
r: 114036
b: refs/heads/master
c: 9707685
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95d9142c8b250b2ce0e0a283fdf54d899dcc4f3e
+refs/heads/master: 97076859590ada76dc4bee46b6ccad86d89e82cf

trunk/Documentation/video4linux/gspca.txt

@@ -97,6 +97,29 @@ sunplus		04a5:3003	Benq DC 1300
 sunplus		04a5:3008	Benq DC 1500
 sunplus		04a5:300a	Benq DC 3410
 spca500		04a5:300c	Benq DC 1016
+finepix		04cb:0104	Fujifilm FinePix 4800
+finepix		04cb:0109	Fujifilm FinePix A202
+finepix		04cb:010b	Fujifilm FinePix A203
+finepix		04cb:010f	Fujifilm FinePix A204
+finepix		04cb:0111	Fujifilm FinePix A205
+finepix		04cb:0113	Fujifilm FinePix A210
+finepix		04cb:0115	Fujifilm FinePix A303
+finepix		04cb:0117	Fujifilm FinePix A310
+finepix		04cb:0119	Fujifilm FinePix F401
+finepix		04cb:011b	Fujifilm FinePix F402
+finepix		04cb:011d	Fujifilm FinePix F410
+finepix		04cb:0121	Fujifilm FinePix F601
+finepix		04cb:0123	Fujifilm FinePix F700
+finepix		04cb:0125	Fujifilm FinePix M603
+finepix		04cb:0127	Fujifilm FinePix S300
+finepix		04cb:0129	Fujifilm FinePix S304
+finepix		04cb:012b	Fujifilm FinePix S500
+finepix		04cb:012d	Fujifilm FinePix S602
+finepix		04cb:012f	Fujifilm FinePix S700
+finepix		04cb:0131	Fujifilm FinePix unknown model
+finepix		04cb:013b	Fujifilm FinePix unknown model
+finepix		04cb:013d	Fujifilm FinePix unknown model
+finepix		04cb:013f	Fujifilm FinePix F420
 sunplus		04f1:1001	JVC GC A50
 spca561		04fc:0561	Flexcam 100
 sunplus		04fc:500c	Sunplus CA500C

trunk/drivers/media/video/gspca/Makefile

@@ -1,5 +1,5 @@
 obj-$(CONFIG_USB_GSPCA)	+= gspca_main.o \
-	gspca_conex.o gspca_etoms.o gspca_mars.o \
+	gspca_conex.o gspca_etoms.o gspca_finepix.o gspca_mars.o \
 	gspca_ov519.o gspca_pac207.o gspca_pac7311.o \
 	gspca_sonixb.o gspca_sonixj.o gspca_spca500.o gspca_spca501.o \
 	gspca_spca505.o gspca_spca506.o gspca_spca508.o gspca_spca561.o \
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB_GSPCA)	+= gspca_main.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