diff options
| author | Christoph Hellwig <hch@lst.de> | 2004-08-01 20:13:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-01 20:13:41 -0700 |
| commit | 02315cb902c3c461b6266f0a1aa71c47760e1e27 (patch) | |
| tree | 7b289722f5bb68f75d6caf8e26878f48ec9436cb /drivers | |
| parent | 1019f5bbe4959a7b440279d60d25972dd8b48d0b (diff) | |
| download | history-02315cb902c3c461b6266f0a1aa71c47760e1e27.tar.gz | |
[PATCH] Fix modular anscd
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/macintosh/ans-lcd.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 78bc356ee3c2e4..f87ed85539d5f1 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -184,7 +184,7 @@ config THERM_PM72 G5 machines. config ANSLCD - bool "Support for ANS LCD display" + tristate "Support for ANS LCD display" depends on ADB_CUDA && PPC_PMAC endmenu diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c index c4b82b5a88dc56..0e130f598a7909 100644 --- a/drivers/macintosh/ans-lcd.c +++ b/drivers/macintosh/ans-lcd.c @@ -136,7 +136,7 @@ const char anslcd_logo[] = "********************" /* Line #1 */ "* Welcome to *" /* Line #2 */ "********************"; /* Line #4 */ -int __init +static int __init anslcd_init(void) { int a; @@ -173,5 +173,12 @@ anslcd_init(void) return 0; } -__initcall(anslcd_init); +static void __exit +anslcd_exit(void) +{ + misc_deregister(&anslcd_dev); + iounmap(anslcd_ptr); +} +module_init(anslcd_init); +module_exit(anslcd_exit); |