summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-27 00:04:59 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-27 00:04:59 +0200
commitd9ecdb282c91952796b7542c4f57fd6de6948d7b (patch)
treefd4de7923968afa7d2981fb037e2255fc2cfa1e1 /net/socket.c
parent[ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26 (diff)
parent[ARM] update defconfig for eseries. (diff)
downloadlinux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.tar.xz
linux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.zip
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 1310a82cbba7..8ef8ba81b9e2 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -265,7 +265,7 @@ static void sock_destroy_inode(struct inode *inode)
container_of(inode, struct socket_alloc, vfs_inode));
}
-static void init_once(struct kmem_cache *cachep, void *foo)
+static void init_once(void *foo)
{
struct socket_alloc *ei = (struct socket_alloc *)foo;