summaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-gemtek-pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 03:41:42 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 03:41:42 +0100
commit977127174a7dff52d17faeeb4c4949a54221881f (patch)
treeb05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/media/radio/radio-gemtek-pci.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)
downloadlinux-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz
linux-977127174a7dff52d17faeeb4c4949a54221881f.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/media/radio/radio-gemtek-pci.c')
-rw-r--r--drivers/media/radio/radio-gemtek-pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 42c8fce04aa2..69ac8aa73eba 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -395,7 +395,7 @@ static struct pci_driver gemtek_pci_driver =
static int __init gemtek_pci_init_module( void )
{
- return pci_module_init( &gemtek_pci_driver );
+ return pci_register_driver( &gemtek_pci_driver );
}
static void __exit gemtek_pci_cleanup_module( void )