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/video/cyblafb.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/video/cyblafb.c')
| -rw-r--r-- | drivers/video/cyblafb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index e9f5dee67e3c..2b972461a030 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
| @@ -1666,6 +1666,7 @@ static int __devinit cyblafb_init(void) | |||
| 1666 | #endif | 1666 | #endif |
| 1667 | output("CyblaFB version %s initializing\n", VERSION); | 1667 | output("CyblaFB version %s initializing\n", VERSION); |
| 1668 | return pci_module_init(&cyblafb_pci_driver); | 1668 | return pci_module_init(&cyblafb_pci_driver); |
| 1669 | return pci_register_driver(&cyblafb_pci_driver); | ||
| 1669 | } | 1670 | } |
| 1670 | 1671 | ||
| 1671 | static void __exit cyblafb_exit(void) | 1672 | static void __exit cyblafb_exit(void) |