summaryrefslogtreecommitdiff
path: root/include/asm-m32r
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 03:48:57 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 03:48:57 -0400
commit2fcf522509cceea524b6e7ece8fd6759b682175a (patch)
treed356e87307e451cce5497ad8daeeeb047befe489 /include/asm-m32r
parentda61396d24e37258817e42537c482e962b4742f7 (diff)
parent1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80 (diff)
/spare/repo/libata-dev branch 'master'
Diffstat (limited to 'include/asm-m32r')
-rw-r--r--include/asm-m32r/checksum.h2
-rw-r--r--include/asm-m32r/socket.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-m32r/checksum.h b/include/asm-m32r/checksum.h
index 99f37dbf2558..877ebf46e9ff 100644
--- a/include/asm-m32r/checksum.h
+++ b/include/asm-m32r/checksum.h
@@ -105,7 +105,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
" addx %0, %3 \n"
" .fillinsn\n"
"2: \n"
- /* Since the input registers which are loaded with iph and ipl
+ /* Since the input registers which are loaded with iph and ihl
are modified, we must also specify them as outputs, or gcc
will assume they contain their original values. */
: "=&r" (sum), "=r" (iph), "=r" (ihl), "=&r" (tmpreg0), "=&r" (tmpreg1)
diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h
index 159519d99042..8b6680f223c0 100644
--- a/include/asm-m32r/socket.h
+++ b/include/asm-m32r/socket.h
@@ -14,6 +14,8 @@
#define SO_BROADCAST 6
#define SO_SNDBUF 7
#define SO_RCVBUF 8
+#define SO_SNDBUFFORCE 32
+#define SO_RCVBUFFORCE 33
#define SO_KEEPALIVE 9
#define SO_OOBINLINE 10
#define SO_NO_CHECK 11