diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-29 23:14:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:41:26 -0700 |
| commit | b0a792818023a8d5f76a6867d9fd052a7f7dc76f (patch) | |
| tree | 3fbec6aee4d9733ef9ee76d9f0e06c06e56fe503 /drivers/staging/xgifb/XGI_main_26.c | |
| parent | 47c92d5f5f1bd2f712a9fcb11b9b7b25cb198761 (diff) | |
| download | op-kernel-dev-b0a792818023a8d5f76a6867d9fd052a7f7dc76f.zip op-kernel-dev-b0a792818023a8d5f76a6867d9fd052a7f7dc76f.tar.gz | |
staging: xgifb: use common init for module and built-in
Use a common init function for module and built-in driver.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 7702293..db9d27b 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2479,9 +2479,7 @@ static int __init xgifb_init(void) return pci_register_driver(&xgifb_driver); } -#ifndef MODULE module_init(xgifb_init); -#endif /*****************************************************/ /* MODULE */ @@ -2509,20 +2507,12 @@ MODULE_PARM_DESC(filter, "\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n" "(Possible values 0-7, default: [no filter])\n"); -static int __init xgifb_init_module(void) -{ - printk("\nXGIfb_init_module"); - - return xgifb_init(); -} - static void __exit xgifb_remove_module(void) { pci_unregister_driver(&xgifb_driver); printk(KERN_DEBUG "xgifb: Module unloaded\n"); } -module_init(xgifb_init_module); module_exit(xgifb_remove_module); #endif /* /MODULE */ |
