diff --git a/[refs] b/[refs] index 7af0c4733eed..a0eea125cff1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cccfc9c4bb3c7888f8249b36e08d6e115238c613 +refs/heads/master: ebec05bdc4f7d3da852aa86fb54b163d9aeb9848 diff --git a/trunk/drivers/hwmon/g760a.c b/trunk/drivers/hwmon/g760a.c index 19c01a49f6be..09ea12e0a551 100644 --- a/trunk/drivers/hwmon/g760a.c +++ b/trunk/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))); }