Commit d825dc17 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

[PATCH] ftape linkage error

Since 2.6.0-test6, ftape can't be configured as a built-in driver.
test6 changed ftape-init.c to call ftape_proc_destroy() also in
the non-MODULE case; however, ftape_proc_destroy() is only defined
when the driver is built as a module. The result is a linkage error.

This fixes this by deleting the #if MODULE around ftape_proc_destroy()'s
definition.
parent 5813ce32
...@@ -207,11 +207,9 @@ int __init ftape_proc_init(void) ...@@ -207,11 +207,9 @@ int __init ftape_proc_init(void)
ftape_read_proc, NULL) != NULL; ftape_read_proc, NULL) != NULL;
} }
#ifdef MODULE
void ftape_proc_destroy(void) void ftape_proc_destroy(void)
{ {
remove_proc_entry("ftape", &proc_root); remove_proc_entry("ftape", &proc_root);
} }
#endif
#endif /* defined(CONFIG_PROC_FS) && defined(CONFIG_FT_PROC_FS) */ #endif /* defined(CONFIG_PROC_FS) && defined(CONFIG_FT_PROC_FS) */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment