summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-11-17 03:07:10 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-17 03:07:10 -0800
commit2022f44610471fd7837defeccd6c49e80ce01579 (patch)
tree442c61c26e3dce498b406f23507f5a0e442b48b6 /include
parent2cdd5908a910dc45eacbf79d5335806850e6984a (diff)
parent0fc7b2216ae55d51ddf3cfdc6e5bf0a0da5ad9d8 (diff)
Merge master.kernel.org:/home/acme/BK/includes-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
-rw-r--r--include/linux/ncp_fs_sb.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index 368a522782e2..cf858eb80f0b 100644
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -18,6 +18,8 @@
#define NCP_DEFAULT_OPTIONS 0 /* 2 for packet signatures */
+struct sock;
+
struct ncp_server {
struct ncp_mount_data_kernel m; /* Nearly all of the mount data is of