Commit 48275bb9 authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds

[PATCH] fix saa7146 compilation

From: Colin Leroy <colin@colino.net>

This patch fixes a compilation error on 2.6.8-rc1.  Here's the error:
drivers/media/common/saa7146_video.c:3: conflicting types for `memory'
include/asm-m68k/setup.h:365: previous declaration of `memory' make[3]: ***
[drivers/media/common/saa7146_video.o] Error 1
Signed-off-by: default avatarColin Leroy <colin@colino.net>
Signed-off-by: default avatarMichael Hunold <hunold@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 351f75d7
#include <media/saa7146_vv.h> #include <media/saa7146_vv.h>
static int memory = 32; static int max_memory = 32;
MODULE_PARM(memory,"i"); MODULE_PARM(max_memory,"i");
MODULE_PARM_DESC(memory, "maximum memory usage for capture buffers (default: 32Mb)"); MODULE_PARM_DESC(max_memory, "maximum memory usage for capture buffers (default: 32Mb)");
#define IS_CAPTURE_ACTIVE(fh) \ #define IS_CAPTURE_ACTIVE(fh) \
(((vv->video_status & STATUS_CAPTURE) != 0) && (vv->video_fh == fh)) (((vv->video_status & STATUS_CAPTURE) != 0) && (vv->video_fh == fh))
...@@ -1331,9 +1331,9 @@ static int buffer_setup(struct file *file, unsigned int *count, unsigned int *si ...@@ -1331,9 +1331,9 @@ static int buffer_setup(struct file *file, unsigned int *count, unsigned int *si
*size = fh->video_fmt.sizeimage; *size = fh->video_fmt.sizeimage;
/* check if we exceed the "memory" parameter */ /* check if we exceed the "max_memory" parameter */
if( (*count * *size) > (memory*1048576) ) { if( (*count * *size) > (max_memory*1048576) ) {
*count = (memory*1048576) / *size; *count = (max_memory*1048576) / *size;
} }
DEB_CAP(("%d buffers, %d bytes each.\n",*count,*size)); DEB_CAP(("%d buffers, %d bytes each.\n",*count,*size));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment