Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[cascardo/linux.git] / drivers / hwmon / g760a.c

diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c
index 19c01a4..09ea12e 100644 (file)
--- a/drivers/hwmon/g760a.c
+++ b/drivers/hwmon/g760a.c
@@ -68,7 +68,7 @@ struct g760a_data {
 #define PWM_FROM_CNT(cnt)      (0xff-(cnt))
 #define PWM_TO_CNT(pwm)                (0xff-(pwm))
 
-unsigned int rpm_from_cnt(u8 val, u32 clk, u16 div)
+static inline unsigned int rpm_from_cnt(u8 val, u32 clk, u16 div)
 {
        return ((val == 0x00) ? 0 : ((clk*30)/(val*div)));
 }