diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /drivers/char/bttv.h | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'drivers/char/bttv.h')
| -rw-r--r-- | drivers/char/bttv.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/bttv.h b/drivers/char/bttv.h index 3a2cd7e21..c1e9b3e9a 100644 --- a/drivers/char/bttv.h +++ b/drivers/char/bttv.h @@ -21,7 +21,7 @@ #ifndef _BTTV_H_ #define _BTTV_H_ -#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,22) +#define BTTV_VERSION_CODE KERNEL_VERSION(0,7,24) #include <linux/types.h> #include <linux/wait.h> @@ -112,7 +112,8 @@ struct bttv_gbuf { #define GBUFFER_GRABBING 1 #define GBUFFER_DONE 2 #define GBUFFER_ERROR 3 - + struct timeval tv; + u16 width; u16 height; u16 fmt; @@ -122,8 +123,7 @@ struct bttv_gbuf { unsigned long re; }; -struct bttv -{ +struct bttv { struct video_device video_dev; struct video_device radio_dev; struct video_device vbi_dev; @@ -193,6 +193,9 @@ struct bttv int i2c_command; int triton1; + int errors; + int needs_restart; + WAIT_QUEUE gpioq; int shutdown; }; |