diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 18:58:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 18:58:54 -0300 |
| commit | 88c7f60f87ea3b6e95e78159d8488256b8379420 (patch) | |
| tree | 1d37fe45f7aa3c3f320571e4385ccb547ae87d6f /linux/drivers/media/video/pwc | |
| parent | 1c178a2161f89b0d03733613f20015cf0e28909d (diff) | |
| parent | 0cdd88b619025b1eb047a9f5f2eb8f51efadcb05 (diff) | |
| download | mediapointer-dvb-s2-88c7f60f87ea3b6e95e78159d8488256b8379420.tar.gz mediapointer-dvb-s2-88c7f60f87ea3b6e95e78159d8488256b8379420.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-uncompress.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index 41418294a..7c97270d3 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -320,7 +320,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) case 730: case 740: case 750: -#if 0 +#if 0 /* keep */ Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private)); kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */ break; diff --git a/linux/drivers/media/video/pwc/pwc-uncompress.c b/linux/drivers/media/video/pwc/pwc-uncompress.c index b37a89a16..eec2c3c45 100644 --- a/linux/drivers/media/video/pwc/pwc-uncompress.c +++ b/linux/drivers/media/video/pwc/pwc-uncompress.c @@ -118,7 +118,7 @@ int pwc_decompress(struct pwc_device *pdev) return -ENXIO; /* No such device or address: missing decompressor */ } -#if 0 +#if 0 /* keep */ switch (pdev->type) { case 675: |