From 7864b69667f9df60583a9d9413252ccf5fc3dc8e Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 16:47:31 -0300
Subject: [PATCH] --- yaml --- r: 109519 b: refs/heads/master c:
 a0b508c2d7d0de0e46555793e334e35381716825 h: refs/heads/master i:   109517:
 3a4ae41422c03cc7b33e0480557eea9388664ede   109515:
 4db0a397c2d375965d01209dc689b8a7c69bb3f1   109511:
 a81d43ab1895ce1e22bf9ac3b4b99eea43b420e3   109503:
 00be7dd28660926af2eb9e2cf39bc8ac3cdd12cf v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/gspca/gspca.h   | 1 -
 trunk/drivers/media/video/gspca/pac207.c  | 1 -
 trunk/drivers/media/video/gspca/spca561.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f1feb745a5d6..f8ffd664fa3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c9d3c59e6fdb8dfadaf7ba38f1d0b64ff066b36
+refs/heads/master: a0b508c2d7d0de0e46555793e334e35381716825
diff --git a/trunk/drivers/media/video/gspca/gspca.h b/trunk/drivers/media/video/gspca/gspca.h
index 67e448940eaa..5cb584546ee6 100644
--- a/trunk/drivers/media/video/gspca/gspca.h
+++ b/trunk/drivers/media/video/gspca/gspca.h
@@ -56,7 +56,6 @@ extern int gspca_debug;
 
 /* device information - set at probe time */
 struct cam {
-	char *dev_name;
 	struct v4l2_pix_format *cam_mode;	/* size nmodes */
 	char nmodes;
 	__u8 epaddr;
diff --git a/trunk/drivers/media/video/gspca/pac207.c b/trunk/drivers/media/video/gspca/pac207.c
index 7ef18d578811..cee45b0486cb 100644
--- a/trunk/drivers/media/video/gspca/pac207.c
+++ b/trunk/drivers/media/video/gspca/pac207.c
@@ -271,7 +271,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 		" (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
 
 	cam = &gspca_dev->cam;
-	cam->dev_name = (char *) id->driver_info;
 	cam->epaddr = 0x05;
 	cam->cam_mode = sif_mode;
 	cam->nmodes = ARRAY_SIZE(sif_mode);
diff --git a/trunk/drivers/media/video/gspca/spca561.c b/trunk/drivers/media/video/gspca/spca561.c
index 02e274452c46..a9f7c99e6f56 100644
--- a/trunk/drivers/media/video/gspca/spca561.c
+++ b/trunk/drivers/media/video/gspca/spca561.c
@@ -602,7 +602,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 	}
 
 	cam = &gspca_dev->cam;
-	cam->dev_name = (char *) id->driver_info;
 	cam->epaddr = 0x01;
 	gspca_dev->nbalt = 7 + 1;	/* choose alternate 7 first */
 	cam->cam_mode = sif_mode;