Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84619b1 authored by Nickolay's avatar Nickolay Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6410): Partial conversion from V4L1 to V4L2 



This is part of the old V4L1->V4L2 bttv patch, ported to current tree
by Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 302f61ad

drivers/media/video/bt8xx/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config VIDEO_BT848

config VIDEO_BT848

	tristate "BT848 Video For Linux"

	tristate "BT848 Video For Linux"

	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1

	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2

	select I2C_ALGOBIT

	select I2C_ALGOBIT

	select FW_LOADER

	select FW_LOADER

	select VIDEO_BTCX

	select VIDEO_BTCX

drivers/media/video/bt8xx/bttv-driver.c

+130 −533

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/bt8xx/bttvp.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -458,10 +458,6 @@ struct bttv { 
extern unsigned int bttv_num;

extern unsigned int bttv_num;

extern struct bttv bttvs[BTTV_MAX];

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)



#endif

#endif





#define btwrite(dat,adr)    writel((dat), btv->bt848_mmio+(adr))

#define btwrite(dat,adr)    writel((dat), btv->bt848_mmio+(adr))