diff --git a/[refs] b/[refs] index 318c5ba3dbff..b6e46f246cca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8e5677f9ebadea9b60980c1bda75c6e6345fd44 +refs/heads/master: 707ff3fbd265bea59035fbd17de5893569d17400 diff --git a/trunk/drivers/media/video/gspca/cpia1.c b/trunk/drivers/media/video/gspca/cpia1.c index 7e08354165c4..f2a9451eea19 100644 --- a/trunk/drivers/media/video/gspca/cpia1.c +++ b/trunk/drivers/media/video/gspca/cpia1.c @@ -1770,9 +1770,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) /* this function is called at probe and resume time */ static int sd_init(struct gspca_dev *gspca_dev) { -#ifdef GSPCA_DEBUG struct sd *sd = (struct sd *) gspca_dev; -#endif int ret; /* Start / Stop the camera to make sure we are talking to