diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 12:53:17 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-02-13 12:53:17 -0800 |
| commit | 8960f8c8e779fa405f031ca6866d6d3ab88e2eae (patch) | |
| tree | b0ad8fa2e78ed5bb065e8bc0ccb1fb877aede54f /include/linux/socket.h | |
| parent | 9b3651cbc26cfcea8276ecaff66718ea087f2e91 (diff) | |
| parent | 22796b15725488002437ebbf98a22fdbe596cf89 (diff) | |
Merge commit 'tip/x86/headers' into x86/untangle2
* commit 'tip/x86/headers': (42 commits)
x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
headers_check fix: linux/in6.h
headers_check fix: linux/coda_psdev.h
headers_check fix: xtensa, swab.h
headers_check fix: powerpc, swab.h
headers_check fix: powerpc, spu_info.h
headers_check fix: powerpc, ps3fb.h
headers_check fix: powerpc, kvm.h
headers_check fix: powerpc, elf.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; |