diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-13 16:07:46 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-13 16:07:46 +0000 |
| commit | 9dfe41790086d342d776ceb3cc240d8c020976e9 (patch) | |
| tree | 1d0172ae40d2c8dc479b8b9c322a55e0dfb2d583 /linux/drivers/media/video/bttvp.h | |
| parent | 3a6970ad156f0a714771661b4557341365e9ce4d (diff) | |
| download | mediapointer-dvb-s2-9dfe41790086d342d776ceb3cc240d8c020976e9.tar.gz mediapointer-dvb-s2-9dfe41790086d342d776ceb3cc240d8c020976e9.tar.bz2 | |
* bttvp.h:
- Fix gcc 4.0 compilation
* cx88-input.c:
- Add remove for MSI TV@nywhere. Thanks to
Jorik Jonker <jorik@dnd.utwente.nl>
Diffstat (limited to 'linux/drivers/media/video/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index 0133eb616..4d9a896ce 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/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.18 2005/06/13 16:07:46 nsh Exp $ bttv - Bt848 frame grabber driver @@ -238,11 +238,6 @@ extern int fini_bttv_i2c(struct bttv *btv); #define dprintk if (bttv_debug >= 1) printk #define d2printk if (bttv_debug >= 2) printk -/* our devices */ -#define BTTV_MAX 16 -extern unsigned int bttv_num; -extern struct bttv bttvs[BTTV_MAX]; - #define BTTV_MAX_FBUF 0x208000 #define VBIBUF_SIZE (2048*VBI_MAXLINES*2) #define BTTV_TIMEOUT (HZ/2) /* 0.5 seconds */ @@ -392,6 +387,11 @@ struct bttv { struct bttv_fh init; }; +/* our devices */ +#define BTTV_MAX 16 +extern unsigned int bttv_num; +extern struct bttv bttvs[BTTV_MAX]; + /* private ioctls */ #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) |