diff options
| -rw-r--r-- | linux/drivers/media/video/zoran_driver.c | 6 | ||||
| -rwxr-xr-x | v4l/scripts/gentree.pl | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c index de85abc45..d7b6d7c96 100644 --- a/linux/drivers/media/video/zoran_driver.c +++ b/linux/drivers/media/video/zoran_driver.c @@ -186,7 +186,7 @@ static const int zoran_num_formats = (sizeof(zoran_formats) / sizeof(struct zoran_format)); // RJ: Test only - want to test BUZ_USE_HIMEM even when CONFIG_BIGPHYS_AREA is defined -#if !defined(CONFIG_BIGPHYS_AREA) +#if !defined(CONFIG_BIGPHYS_AREA) && !defined(BUZ_USE_HIMEM) //#undef CONFIG_BIGPHYS_AREA #define BUZ_USE_HIMEM #endif @@ -404,7 +404,8 @@ v4l_fbuffer_alloc (struct file *file) /* Zero out the allocated memory */ memset(fh->v4l_buffers.buffer[i].fbuffer, 0, fh->v4l_buffers.buffer_size); -#elif defined(BUZ_USE_HIMEM) +#else +#if defined(BUZ_USE_HIMEM) /* Use high memory which has been left at boot time */ @@ -458,6 +459,7 @@ v4l_fbuffer_alloc (struct file *file) fh->v4l_buffers.buffer_size >> 10); return -ENOBUFS; #endif +#endif } } diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index 08969dab3..3e26d8d92 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -67,6 +67,8 @@ my %defs = ( 'I2C_CLASS_TV_DIGITAL' => 1, 'OLD_XMIT_LOCK' => 0, 'CONFIG_VIVI_SCATTER' => 0, + 'CONFIG_BIGPHYS_AREA' => 0, + 'BUZ_USE_HIMEM' => 1, ); ################################################################# |