Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Remove SunOS and Solaris binary support.

1 files changed, 0 insertions, 9 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 5ac052693554..5dbb81bc9673 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -450,15 +450,6 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
          *      Options without arguments
          */
 
-#ifdef SO_DONTLINGER            /* Compatibility item... */
-        if (optname == SO_DONTLINGER) {
-                lock_sock(sk);
-                sock_reset_flag(sk, SOCK_LINGER);
-                release_sock(sk);
-                return 0;
-        }
-#endif
-
         if (optname == SO_BINDTODEVICE)
                 return sock_bindtodevice(sk, optval, optlen);