diff --git a/[refs] b/[refs] index f202fa5228ec..97906fd1bbc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 880ae24d35d357037d5ad5c3148383fde1070a12 +refs/heads/master: d7280518ef8151600aad1e6b999464df435b608b diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h b/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h index 1a37ae4bc82d..a9d24ab79950 100644 --- a/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h +++ b/trunk/drivers/media/video/gspca/m5602/m5602_bridge.h @@ -90,13 +90,7 @@ #define M5602_ISOC_ENDPOINT_ADDR 0x81 #define M5602_INTR_ENDPOINT_ADDR 0x82 -#define M5602_MAX_FRAMES 32 -#define M5602_URBS 2 -#define M5602_ISOC_PACKETS 14 - -#define M5602_URB_TIMEOUT msecs_to_jiffies(2 * M5602_ISOC_PACKETS) #define M5602_URB_MSG_TIMEOUT 5000 -#define M5602_FRAME_TIMEOUT 2 /*****************************************************************************/