summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-10-28 14:16:43 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-10-28 14:16:43 +0900
commitd4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch)
tree28e799ec49f72bf37f39d192d21f25bffb682aab /include/linux/kernel.h
parentf5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff)
parent396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 46ac9a50528d..8eefcf7e95eb 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -382,7 +382,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
}
extern int hex_to_bin(char ch);
-extern void hex2bin(u8 *dst, const char *src, size_t count);
+extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);
/*
* General tracing related utility functions - trace_printk(),