diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/media/radio/radio-gemtek-pci.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
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.c | 2 |
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 = | |||
| 395 | 395 | ||
| 396 | static int __init gemtek_pci_init_module( void ) | 396 | static int __init gemtek_pci_init_module( void ) |
| 397 | { | 397 | { |
| 398 | return pci_module_init( &gemtek_pci_driver ); | 398 | return pci_register_driver( &gemtek_pci_driver ); |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | static void __exit gemtek_pci_cleanup_module( void ) | 401 | static void __exit gemtek_pci_cleanup_module( void ) |