summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/errno.h1
-rw-r--r--include/asm-i386/socket.h2
-rw-r--r--include/asm-i386/termios.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-i386/errno.h b/include/asm-i386/errno.h
index d22c4472b..7cf599f4d 100644
--- a/include/asm-i386/errno.h
+++ b/include/asm-i386/errno.h
@@ -128,6 +128,5 @@
#define ENOMEDIUM 123 /* No medium found */
#define EMEDIUMTYPE 124 /* Wrong medium type */
-#define EHASHCOLLISION 125 /* Number of hash collisons exceeds maximum generation counter value. */
#endif
diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h
index c44d16bc0..18cd5b9fe 100644
--- a/include/asm-i386/socket.h
+++ b/include/asm-i386/socket.h
@@ -43,6 +43,8 @@
#define SO_TIMESTAMP 29
#define SCM_TIMESTAMP SO_TIMESTAMP
+#define SO_ACCEPTCONN 30
+
/* Nasty libc5 fixup - bletch */
#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
/* Socket types. */
diff --git a/include/asm-i386/termios.h b/include/asm-i386/termios.h
index 9b337736f..70c1ecefd 100644
--- a/include/asm-i386/termios.h
+++ b/include/asm-i386/termios.h
@@ -51,7 +51,7 @@ struct termio {
#define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */
#define N_R3964 9 /* Reserved for Simatic R3964 module */
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */
+#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */
#define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */
#define N_HDLC 13 /* synchronous HDLC */
#define N_SYNC_PPP 14 /* synchronous PPP */