Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs...

[~andy/linux] / lib / bcd.c

diff --git a/lib/bcd.c b/lib/bcd.c
index 55efaf7423462d9d116aad5e3383e83e0952967e..40d304efe27281151124a874cdbac864f997a7ee 100644 (file)
--- a/lib/bcd.c
+++ b/lib/bcd.c
@@ -1,14 +1,14 @@
 #include <linux/bcd.h>
 #include <linux/export.h>
 
-unsigned bcd2bin(unsigned char val)
+unsigned _bcd2bin(unsigned char val)
 {
        return (val & 0x0f) + (val >> 4) * 10;
 }
-EXPORT_SYMBOL(bcd2bin);
+EXPORT_SYMBOL(_bcd2bin);
 
-unsigned char bin2bcd(unsigned val)
+unsigned char _bin2bcd(unsigned val)
 {
        return ((val / 10) << 4) + val % 10;
 }
-EXPORT_SYMBOL(bin2bcd);
+EXPORT_SYMBOL(_bin2bcd);