Merge branch 'omap-pool'

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

diff --git a/drivers/media/video/gspca/m5602/m5602_sensor.h b/drivers/media/video/gspca/m5602/m5602_sensor.h
index 261623f0da4818c220e21f2a0fa052648ac11ba3..0d3026936f2e90a8d4b842df62b73d03f0039581 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_sensor.h
+++ b/drivers/media/video/gspca/m5602/m5602_sensor.h
@@ -21,11 +21,6 @@
 
 #include "m5602_bridge.h"
 
-#define M5602_DEFAULT_FRAME_WIDTH  640
-#define M5602_DEFAULT_FRAME_HEIGHT 480
-
-#define M5602_MAX_CTRLS                (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
-
 /* Enumerates all supported sensors */
 enum sensors {
        OV9650_SENSOR   = 1,
@@ -61,14 +56,14 @@ struct m5602_sensor {
        /* Executed when the camera starts to send data */
        int (*start)(struct sd *sd);
 
-       /* Performs a power down sequence */
-       int (*power_down)(struct sd *sd);
+       /* Executed when the camera ends to send data */
+       int (*stop)(struct sd *sd);
 
-       int nctrls;
-       struct ctrl ctrls[M5602_MAX_CTRLS];
+       /* Executed when the device is disconnected */
+       void (*disconnect)(struct sd *sd);
 
-       char nmodes;
-       struct v4l2_pix_format modes[];
+       /* Performs a power down sequence */
+       int (*power_down)(struct sd *sd);
 };
 
 #endif