summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bttv-driver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 241a163aa..1002e3a91 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.77 2005/12/07 12:03:24 mchehab Exp $
+ $Id: bttv-driver.c,v 1.78 2005/12/07 14:17:02 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -4311,7 +4311,11 @@ 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)