diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-14 01:07:18 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-14 01:07:18 +0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /drivers/media/video/zoran.h | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
| download | linux-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.tar.xz | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/video/zoran.h')
| -rw-r--r-- | drivers/media/video/zoran.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h index ffcda95ed9d4..8fb4a3414e0a 100644 --- a/drivers/media/video/zoran.h +++ b/drivers/media/video/zoran.h @@ -267,7 +267,7 @@ struct zoran_v4l_settings { }; /* whoops, this one is undeclared if !v4l2 */ -#ifndef HAVE_V4L2 +#ifndef CONFIG_VIDEO_V4L2 struct v4l2_jpegcompression { int quality; int APPn; |