summaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-maxiradio.c
diff options
context:
space:
mode:
authorLinus Torvalds2006-01-10 03:41:42 +0100
committerLinus Torvalds2006-01-10 03:41:42 +0100
commit977127174a7dff52d17faeeb4c4949a54221881f (patch)
treeb05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/media/radio/radio-maxiradio.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6 (diff)
parent[PATCH] drivers/*rest*: Replace pci_module_init() with pci_register_driver() (diff)
downloadkernel-qcow2-linux-977127174a7dff52d17faeeb4c4949a54221881f.tar.gz
kernel-qcow2-linux-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz
kernel-qcow2-linux-977127174a7dff52d17faeeb4c4949a54221881f.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/media/radio/radio-maxiradio.c')
-rw-r--r--drivers/media/radio/radio-maxiradio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 30869308332a..c975ddd86cd5 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -338,7 +338,7 @@ static struct pci_driver maxiradio_driver = {
static int __init maxiradio_radio_init(void)
{
- return pci_module_init(&maxiradio_driver);
+ return pci_register_driver(&maxiradio_driver);
}
static void __exit maxiradio_radio_exit(void)