diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 03:41:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 03:41:42 +0100 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/media/radio | |
| parent | Merge 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) | |
| download | linux-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')
| -rw-r--r-- | drivers/media/radio/radio-gemtek-pci.c | 2 | ||||
| -rw-r--r-- | drivers/media/radio/radio-maxiradio.c | 2 |
2 files changed, 2 insertions, 2 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 ) 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) |