Commit 0a9e26b3 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix arlan compilation with CONFIG_PROC_FS=n

From: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>

when PROC_FS=n, arlan.h will define init_arlan_proc() and
cleanup_arlan_proc() as macros.  So, whitout the #ifdef/#endif here, we have
two definitions.
parent 52ace925
...@@ -1229,7 +1229,7 @@ static ctl_table arlan_root_table[] = ...@@ -1229,7 +1229,7 @@ static ctl_table arlan_root_table[] =
//}; //};
#ifdef CONFIG_PROC_FS
static struct ctl_table_header *arlan_device_sysctl_header; static struct ctl_table_header *arlan_device_sysctl_header;
int __init init_arlan_proc(void) int __init init_arlan_proc(void)
...@@ -1254,3 +1254,4 @@ void __exit cleanup_arlan_proc(void) ...@@ -1254,3 +1254,4 @@ void __exit cleanup_arlan_proc(void)
arlan_device_sysctl_header = NULL; arlan_device_sysctl_header = NULL;
} }
#endif
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