diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/hwmon/g760a.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/hwmon/g760a.c')
| -rw-r--r-- | drivers/hwmon/g760a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c index 19c01a49f6be..09ea12e0a551 100644 --- a/drivers/hwmon/g760a.c +++ b/drivers/hwmon/g760a.c | |||
| @@ -68,7 +68,7 @@ struct g760a_data { | |||
| 68 | #define PWM_FROM_CNT(cnt) (0xff-(cnt)) | 68 | #define PWM_FROM_CNT(cnt) (0xff-(cnt)) |
| 69 | #define PWM_TO_CNT(pwm) (0xff-(pwm)) | 69 | #define PWM_TO_CNT(pwm) (0xff-(pwm)) |
| 70 | 70 | ||
| 71 | unsigned int rpm_from_cnt(u8 val, u32 clk, u16 div) | 71 | static inline unsigned int rpm_from_cnt(u8 val, u32 clk, u16 div) |
| 72 | { | 72 | { |
| 73 | return ((val == 0x00) ? 0 : ((clk*30)/(val*div))); | 73 | return ((val == 0x00) ? 0 : ((clk*30)/(val*div))); |
| 74 | } | 74 | } |