From 0b34b6c3504db2f4623703d18b7ee1430b05e022 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 7 Dec 2005 15:29:32 +0000 Subject: Reverted a wrong commit at the previous patch. kernel-sync Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bttv-driver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 1002e3a91..25d1fe218 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.78 2005/12/07 14:17:02 mchehab Exp $ + $Id: bttv-driver.c,v 1.79 2005/12/07 15:29:32 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -4311,11 +4311,7 @@ static int bttv_init_module(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) bus_register(&bttv_sub_bus_type); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - return pci_module_init(&bttv_pci_driver); -#else return pci_register_driver(&bttv_pci_driver); -#endif } static void bttv_cleanup_module(void) -- cgit v1.2.3