diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/sbus/char/flash.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/sbus/char/flash.c')
| -rw-r--r-- | drivers/sbus/char/flash.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 8690638b3..71809b59d 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c @@ -1,4 +1,4 @@ -/* $Id: flash.c,v 1.19 2000/07/13 08:06:40 davem Exp $ +/* $Id: flash.c,v 1.20 2000/11/08 04:57:49 davem Exp $ * flash.c: Allow mmap access to the OBP Flash, for OBP updates. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -149,11 +149,7 @@ static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; EXPORT_NO_SYMBOLS; -#ifdef MODULE -int init_module(void) -#else -int __init flash_init(void) -#endif +static int __init flash_init(void) { struct sbus_bus *sbus; struct sbus_dev *sdev = 0; @@ -236,9 +232,10 @@ int __init flash_init(void) return 0; } -#ifdef MODULE -void cleanup_module(void) +static void __exit flash_cleanup(void) { misc_deregister(&flash_dev); } -#endif + +module_init(flash_init); +module_exit(flash_cleanup); |