From 5a5977599e8e4f8e2f284d41f6ae11c492c8faff Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 7 Jan 2009 16:37:31 +0100
Subject: [PATCH] --- yaml --- r: 126975 b: refs/heads/master c:
 2f650631b3710622666367474b5475ff81ba486e h: refs/heads/master i:   126973:
 fae995189e7859d3ffc144e38a8893ebc1d0ee6c   126971:
 deef2e0e19ad1cf4be1ca4bb27abcb95b02cf812   126967:
 a69043d805b4dd1881c765f5ad58cb4744a45b09   126959:
 bbf5feb6ad81ee7c5542ebce54b0fc1fea52341c   126943:
 487a13e087a23885b05ccc4c93f6d151974f3239   126911:
 83473a54732f7feae05703b82662a3c749515868   126847:
 50bdedb5c40df0210de85ab54959e7c126a6000a   126719:
 74b1a2f94d1a1b083f448ee896996866c318d4d4   126463:
 f55fdeb4cb93476c25e809c1a15761b7c7b0e290   125951:
 68ba505c04c421c85b54d24f906e043443f17677   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9   122879:
 b3224e7a67c3a427e66fac19d63da08dfe2ae7e8 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/hwmon/f71882fg.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f8ffb1e4ff3..b0c354bd736c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28ba858798d5c70513cd8b9742841fd1bd49a074
+refs/heads/master: 2f650631b3710622666367474b5475ff81ba486e
diff --git a/trunk/drivers/hwmon/f71882fg.c b/trunk/drivers/hwmon/f71882fg.c
index a6dc3c7787f7..d867b377d4e9 100644
--- a/trunk/drivers/hwmon/f71882fg.c
+++ b/trunk/drivers/hwmon/f71882fg.c
@@ -810,12 +810,12 @@ static inline void superio_exit(int base)
 	outb(SIO_LOCK_KEY, base);
 }
 
-static inline u16 fan_from_reg(u16 reg)
+static inline int fan_from_reg(u16 reg)
 {
 	return reg ? (1500000 / reg) : 0;
 }
 
-static inline u16 fan_to_reg(u16 fan)
+static inline u16 fan_to_reg(int fan)
 {
 	return fan ? (1500000 / fan) : 0;
 }