From d825dc17616ed5f39224f9b340d47c14e9b1ec60 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Wed, 8 Oct 2003 18:02:07 -0700 Subject: [PATCH] [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. --- drivers/char/ftape/lowlevel/ftape-proc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/char/ftape/lowlevel/ftape-proc.c b/drivers/char/ftape/lowlevel/ftape-proc.c index cfea418c5599d..6b8844ff455c1 100644 --- a/drivers/char/ftape/lowlevel/ftape-proc.c +++ b/drivers/char/ftape/lowlevel/ftape-proc.c @@ -207,11 +207,9 @@ int __init ftape_proc_init(void) ftape_read_proc, NULL) != NULL; } -#ifdef MODULE void ftape_proc_destroy(void) { remove_proc_entry("ftape", &proc_root); } -#endif #endif /* defined(CONFIG_PROC_FS) && defined(CONFIG_FT_PROC_FS) */ -- 2.53.0