diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/asm-m68k | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/bitops.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/socket.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/termios.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index 7d91887d7..5b40d766f 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h @@ -228,7 +228,7 @@ extern __inline__ int ffs(int x) { int cnt; - asm ("bfffo %1{#0:#0}" : "=d" (cnt) : "dm" (x & -x)); + asm ("bfffo %1{#0:#0},%0" : "=d" (cnt) : "dm" (x & -x)); return 32 - cnt; } diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h index fa13cd8ff..1d01fc087 100644 --- a/include/asm-m68k/socket.h +++ b/include/asm-m68k/socket.h @@ -43,6 +43,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-m68k/termios.h b/include/asm-m68k/termios.h index 0f127c134..411018fdb 100644 --- a/include/asm-m68k/termios.h +++ b/include/asm-m68k/termios.h @@ -61,7 +61,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 IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - 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 |