Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / media / video / gspca / m5602 / m5602_bridge.h

diff --git a/drivers/media/video/gspca/m5602/m5602_bridge.h b/drivers/media/video/gspca/m5602/m5602_bridge.h
index a3f3b7a0c7e75e59f8262751d9370d48cf0ccf79..8f1cea6fd3bface9c601eda1dc6de8befc507a0b 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_bridge.h
+++ b/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;