git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
gspca
/
cpia1.c
diff --git
a/drivers/media/video/gspca/cpia1.c
b/drivers/media/video/gspca/cpia1.c
index
203bab9
..
9b12168
100644
(file)
--- a/
drivers/media/video/gspca/cpia1.c
+++ b/
drivers/media/video/gspca/cpia1.c
@@
-1753,7
+1753,9
@@
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