diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-03-27 19:41:11 +0100 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2009-03-27 19:41:11 +0100 |
commit | 0621621f15c1a958fb57ddfd061bc02e1978cb30 (patch) | |
tree | 4b6269cc03c70d13c4e276cb158e81b762bf1de0 /linux/drivers/media/video/gspca/m5602/m5602_bridge.h | |
parent | 03ddd50e8bf14d07eacd58ead6b8fd9236ef0982 (diff) | |
parent | e5da3241f55625c20de4bcc0e12da75f9ffd68fa (diff) | |
download | mediapointer-dvb-s2-0621621f15c1a958fb57ddfd061bc02e1978cb30.tar.gz mediapointer-dvb-s2-0621621f15c1a958fb57ddfd061bc02e1978cb30.tar.bz2 |
merge:v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602/m5602_bridge.h')
-rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_bridge.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_bridge.h b/linux/drivers/media/video/gspca/m5602/m5602_bridge.h index a3f3b7a0c..8f1cea6fd 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_bridge.h +++ b/linux/drivers/media/video/gspca/m5602/m5602_bridge.h @@ -112,14 +112,14 @@ static const unsigned char sensor_urb_skeleton[] = { struct sd { struct gspca_dev gspca_dev; - /* The name of the m5602 camera */ - char *name; - /* A pointer to the currently connected sensor */ - struct m5602_sensor *sensor; + const struct m5602_sensor *sensor; struct sd_desc *desc; + /* Sensor private data */ + void *sensor_priv; + /* The current frame's id, used to detect frame boundaries */ u8 frame_id; |