diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-03 13:55:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-03 13:55:06 +0100 |
| commit | 87fe85133fa7f33c2bc9882826666a7f117c62bd (patch) | |
| tree | ab251f47a34b8c8c5b7c21aa45c818de926aa8d1 /include/linux/socket.h | |
| parent | 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef (diff) | |
| parent | 15c554439faedfa490389b31db893dc764245e88 (diff) | |
Merge branch 'core/header-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tipclean into core/header-fixes
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 20fc4bbfca4..afc01909a42 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -24,10 +24,12 @@ struct __kernel_sockaddr_storage { #include <linux/types.h> /* pid_t */ #include <linux/compiler.h> /* __user */ -#ifdef CONFIG_PROC_FS +#ifdef __KERNEL__ +# ifdef CONFIG_PROC_FS struct seq_file; extern void socket_seq_show(struct seq_file *seq); -#endif +# endif +#endif /* __KERNEL__ */ typedef unsigned short sa_family_t; |