From: Andrew Morton <akpm@osdl.org>

Two patches added the same field.

Cc: Evgeniy Polyakov <johnpol@2ka.mitp.ru>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/fs.h |    4 ----
 1 file changed, 4 deletions(-)

diff -puN include/linux/fs.h~kevent-socket-notifications-fix-2 include/linux/fs.h
--- a/include/linux/fs.h~kevent-socket-notifications-fix-2
+++ a/include/linux/fs.h
@@ -602,10 +602,6 @@ struct inode {
 	struct kevent_storage	st;
 #endif
 
-#ifdef CONFIG_KEVENT_SOCKET
-	struct kevent_storage	st;
-#endif
-
 	unsigned long		i_state;
 	unsigned long		dirtied_when;	/* jiffies of first dirtying */
 
_