From bbf5feb6ad81ee7c5542ebce54b0fc1fea52341c Mon Sep 17 00:00:00 2001
From: Mark van Doesburg <mark.vandoesburg@hetnet.nl>
Date: Wed, 7 Jan 2009 16:37:27 +0100
Subject: [PATCH] --- yaml --- r: 126959 b: refs/heads/master c:
 77a4a3e2a36aea5896f86653f6b77168d578c962 h: refs/heads/master i:   126957:
 de239f38b7506d9473082f628ae2320ae45dc0c3   126955:
 e454eb56e19a9f17ac65d5986c450ae37423c867   126951:
 e0e0bb04e9310cabc21f0cf810e841b295f0dc24   126943:
 487a13e087a23885b05ccc4c93f6d151974f3239 v: v3

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

diff --git a/[refs] b/[refs]
index 0e22c25a9aed..25bc229d4293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc37ae71207ca899efb93be1fe6b000366debc3a
+refs/heads/master: 77a4a3e2a36aea5896f86653f6b77168d578c962
diff --git a/trunk/drivers/hwmon/f71882fg.c b/trunk/drivers/hwmon/f71882fg.c
index e2f3c5a82153..c6fa8578bdeb 100644
--- a/trunk/drivers/hwmon/f71882fg.c
+++ b/trunk/drivers/hwmon/f71882fg.c
@@ -27,11 +27,11 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define DRVNAME "f71882fg"
 
-#define SIO_F71882FG_LD_HWM	0x04	/* Hardware monitor logical device*/
+#define SIO_F71882FG_LD_HWM	0x04	/* Hardware monitor logical device */
 #define SIO_UNLOCK_KEY		0x87	/* Key to enable Super-I/O */
 #define SIO_LOCK_KEY		0xAA	/* Key to diasble Super-I/O */
 
@@ -78,7 +78,7 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-static struct platform_device *f71882fg_pdev = NULL;
+static struct platform_device *f71882fg_pdev;
 
 /* Super-I/O Function prototypes */
 static inline int superio_inb(int base, int reg);
@@ -114,7 +114,7 @@ struct f71882fg_data {
 	u8	temp_diode_open;
 };
 
-/* Sysfs in*/
+/* Sysfs in */
 static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
 	char *buf);
 static ssize_t show_in_max(struct device *dev, struct device_attribute
@@ -335,7 +335,7 @@ static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val)
 	outb(val, data->addr + DATA_REG_OFFSET);
 }
 
-static struct f71882fg_data *f71882fg_update_device(struct device * dev)
+static struct f71882fg_data *f71882fg_update_device(struct device *dev)
 {
 	struct f71882fg_data *data = dev_get_drvdata(dev);
 	int nr, reg, reg2;