summaryrefslogtreecommitdiffstats
path: root/arch/mn10300/lib/checksum.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-25 15:52:48 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-25 15:52:48 +0100
commitf1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch)
tree4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mn10300/lib/checksum.c
parentASoC: ad1836: reset and restore clock control mode in suspend/resume entry (diff)
parentASoC: fix a memory-leak in wm8903 (diff)
downloadlinux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.xz
linux-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/mn10300/lib/checksum.c')
-rw-r--r--arch/mn10300/lib/checksum.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/lib/checksum.c b/arch/mn10300/lib/checksum.c
index 274f29ec33c1..b6580f5d89ee 100644
--- a/arch/mn10300/lib/checksum.c
+++ b/arch/mn10300/lib/checksum.c
@@ -22,6 +22,7 @@ static inline unsigned short from32to16(__wsum sum)
" addc 0xffff,%0 \n"
: "=r" (sum)
: "r" (sum << 16), "0" (sum & 0xffff0000)
+ : "cc"
);
return sum >> 16;
}