diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/char/ppdev.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/char/ppdev.c')
| -rw-r--r-- | drivers/char/ppdev.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 5afcec0c9..71bb3a18c 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -43,6 +43,7 @@ */ #include <linux/module.h> +#include <linux/init.h> #include <linux/sched.h> #include <linux/ioctl.h> #include <linux/parport.h> @@ -578,11 +579,7 @@ static struct file_operations pp_fops = { pp_release }; -#ifdef MODULE -#define pp_init init_module -#endif - -int pp_init (void) +static int __init ppdev_init (void) { if (register_chrdev (PP_MAJOR, CHRDEV, &pp_fops)) { printk (KERN_WARNING CHRDEV ": unable to get major %d\n", @@ -594,10 +591,11 @@ int pp_init (void) return 0; } -#ifdef MODULE -void cleanup_module (void) +static void __exit ppdev_cleanup (void) { /* Clean up all parport stuff */ unregister_chrdev (PP_MAJOR, CHRDEV); } -#endif /* MODULE */ + +module_init(ppdev_init); +module_exit(ppdev_cleanup); |