diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 177925ef52..a08a87f8d9 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* libnetworking/sys/socket.h (struct sockwakeup):
+	Use void* instead of caddr_t.
 	* librpc/include/rpc/xdr.h: Cosmetics from freebsd.
 
 2010-05-26	Ralf Corsépius <ralf.corsepius@rtems.org>
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/sys/socket.h
index 45bb9151f3..0bc1dcdefa 100644
--- a/cpukit/libnetworking/sys/socket.h
+++ b/cpukit/libnetworking/sys/socket.h
@@ -123,8 +123,8 @@ struct	linger {
  */
 struct socket;
 struct	sockwakeup {
-	void	(*sw_pfn)(struct socket *, caddr_t);
-	caddr_t	sw_arg;
+	void	(*sw_pfn)(struct socket *, void *);
+	void	*sw_arg;
 };
 
 /*