diff options
author | 2005-06-30 00:49:18 -0400 | |
---|---|---|
committer | 2005-06-30 00:49:18 -0400 | |
commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /drivers/media/video/bttvp.h | |
parent | wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h (diff) | |
parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
download | linux-dev-0c168775709faa74c1b87f1e61046e0c51ade7f3.tar.xz linux-dev-0c168775709faa74c1b87f1e61046e0c51ade7f3.zip |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'drivers/media/video/bttvp.h')
-rw-r--r-- | drivers/media/video/bttvp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 7b6f1e856028..f3293e4a15ad 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.17 2005/02/16 12:14:10 kraxel Exp $ + $Id: bttvp.h,v 1.19 2005/06/16 21:38:45 nsh Exp $ bttv - Bt848 frame grabber driver @@ -326,6 +326,9 @@ struct bttv { int opt_vcr_hack; int opt_whitecrush_upper; int opt_whitecrush_lower; + int opt_uv_ratio; + int opt_full_luma_range; + int opt_coring; /* radio data/state */ int has_radio; |