diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /include/linux/socket.h | |
| parent | x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined (diff) | |
| parent | unconditionally include asm/types.h from linux/types.h (diff) | |
| download | wireguard-linux-22796b15725488002437ebbf98a22fdbe596cf89.tar.xz wireguard-linux-22796b15725488002437ebbf98a22fdbe596cf89.zip | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
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 20fc4bbfca42..afc01909a428 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; |