aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/media/video/saa7134
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index f87757fccc72..c673901cb2b5 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1319,7 +1319,7 @@ static struct pci_driver saa7134_pci_driver = {
1319#endif 1319#endif
1320}; 1320};
1321 1321
1322static int saa7134_init(void) 1322static int __init saa7134_init(void)
1323{ 1323{
1324 INIT_LIST_HEAD(&saa7134_devlist); 1324 INIT_LIST_HEAD(&saa7134_devlist);
1325 printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n", 1325 printk(KERN_INFO "saa7130/34: v4l2 driver version %d.%d.%d loaded\n",
@@ -1333,7 +1333,7 @@ static int saa7134_init(void)
1333 return pci_register_driver(&saa7134_pci_driver); 1333 return pci_register_driver(&saa7134_pci_driver);
1334} 1334}
1335 1335
1336static void saa7134_fini(void) 1336static void __exit saa7134_fini(void)
1337{ 1337{
1338 pci_unregister_driver(&saa7134_pci_driver); 1338 pci_unregister_driver(&saa7134_pci_driver);
1339} 1339}