summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/bttv-driver.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-core.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 2212c82a7..e3d2d29fc 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.74 2005/12/04 12:21:15 hverkuil Exp $
+ $Id: bttv-driver.c,v 1.75 2005/12/04 21:06:50 mkrufky Exp $
bttv - Bt848 frame grabber driver
@@ -4313,7 +4313,7 @@ static int bttv_init_module(void)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
bus_register(&bttv_sub_bus_type);
#endif
- return pci_module_init(&bttv_pci_driver);
+ return pci_register_driver(&bttv_pci_driver);
}
static void bttv_cleanup_module(void)
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index 7c5cba501..3893f36c6 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-alsa.c,v 1.10 2005/10/25 19:24:47 nsh Exp $
+ * $Id: cx88-alsa.c,v 1.11 2005/12/04 21:06:50 mkrufky Exp $
*
* Support for audio capture
* PCI function #1 of the cx2388x.
@@ -919,7 +919,7 @@ static int cx88_audio_init(void)
printk(KERN_INFO "cx2388x: snapshot date %04d-%02d-%02d\n",
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
#endif
- return pci_module_init(&cx88_audio_pci_driver);
+ return pci_register_driver(&cx88_audio_pci_driver);
}
/*
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 67ba9f990..04417b127 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-core.c,v 1.57 2005/11/24 21:51:41 nsh Exp $
+ * $Id: saa7134-core.c,v 1.58 2005/12/04 21:06:50 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* driver core
@@ -1228,7 +1228,7 @@ static int saa7134_init(void)
printk(KERN_INFO "saa7130/34: snapshot date %04d-%02d-%02d\n",
SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
#endif
- return pci_module_init(&saa7134_pci_driver);
+ return pci_register_driver(&saa7134_pci_driver);
}
static void saa7134_fini(void)